diff options
Diffstat (limited to 'jjb')
29 files changed, 79 insertions, 73 deletions
diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml index 4e9c16c44..0b3abdfff 100644 --- a/jjb/aai/aai-csit.yaml +++ b/jjb/aai/aai-csit.yaml @@ -5,6 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'aai' + disabled: true stream: - 'master': branch: master @@ -16,4 +17,3 @@ - 'esr-server': trigger_jobs: 'aai-esr-server-{stream}-docker-java-daily' robot-options: '' - diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml index 3c2579301..63b6e80f9 100644 --- a/jjb/clamp/clamp-csit.yaml +++ b/jjb/clamp/clamp-csit.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' functionality: - 'APIs': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/cli/cli-csit.yaml b/jjb/cli/cli-csit.yaml index 48d1151ef..7438b8689 100644 --- a/jjb/cli/cli-csit.yaml +++ b/jjb/cli/cli-csit.yaml @@ -5,6 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'cli' + disabled: true stream: - 'master': branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 294623ebf..3786b7d9b 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -9,12 +9,11 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true - mvn-goals: 'clean deploy -Ddocker.skip' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - mvn-goals: 'clean package docker:build -DpushImage' + mvn-goals: 'clean package docker:build docker:push' - '{project-name}-gerrit-release-jobs': build-node: centos7-builder-4c-4g project: 'dcaegen2/services/prh' diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml index 1ba6d5d58..85593ba22 100644 --- a/jjb/dmaap/dmaap-buscontroller-csit.yaml +++ b/jjb/dmaap/dmaap-buscontroller-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'dmaap-buscontroller' stream: 'master' + disabled: true functionality: - 'ssl': trigger_jobs: diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index b758ba5a4..66bb307f2 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -23,7 +23,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' - '{project-name}-gerrit-release-jobs': - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'externalapi/nbi' stream: - 'master': diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml index 38a06ce34..0df129366 100644 --- a/jjb/global-templates-c.yaml +++ b/jjb/global-templates-c.yaml @@ -101,35 +101,3 @@ settings-file: '{mvn-settings}' - docker-login - shell: '{script}' - -- job-template: - # - # job template for build project executed every 6hrs - # - # Required Variables: - # script: build script to execute - name: '{name}-{stream}-shell-6hrs' - node: '{build-node}' - type: freestyle - - parameters: - - lf-infra-parameters: - branch: '{branch}' - project: '{project}' - stream: '{stream}' - lftools-version: '{lftools-version}' - - scm: - - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - submodule-recursive: '{submodule-recursive}' - choosing-strategy: 'gerrit' - - triggers: - - timed: '00 */6 * * *' - - builders: - - shell: '{script}' - - publishers: - - lf-infra-publish diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index fcbf745fc..e6f074407 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -2,6 +2,52 @@ # vim: sw=2 ts=2 sts=2 et : - job-template: + # + # job template for verifying gerrit changeset by shell script + # + # Required Variables: + # project-name: name of project + # area: area of project covered with this verification job + # project: name of scm repository to work on + # stream: name of stream used (set the same as branch if you're not sure) + # branch: git branch to work on + # script: build script to execute + # Optional Variables: + # pattern: trigger job only if modification covered file in pattern + # build-node: label(flavor) of jenkins slave + name: '{project-name}-{stream}-{area}-verify-shell' + node: '{build-node}' + type: freestyle + + pattern: '**' + + parameters: + - lf-infra-parameters: + branch: '{branch}' + project: '{project}' + 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: '{project}' + branch: '{branch}' + files: '{pattern}' + + builders: + - shell: '{script}' + + publishers: + - lf-infra-publish + +- job-template: # Job template for merging a submission. triggered on # gerrit-trigger-patch-merged, does scm, mvn with passed-in goals, then # run script diff --git a/jjb/holmes/holmes-csit.yaml b/jjb/holmes/holmes-csit.yaml index 9d2323aaf..bf7e768a9 100644 --- a/jjb/holmes/holmes-csit.yaml +++ b/jjb/holmes/holmes-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'holmes-rule-management' stream: 'master' + disabled: true functionality: - 'sanity-check': trigger_jobs: 'holmes-rule-management-master-docker-java-daily' diff --git a/jjb/modeling/modeling-etsicatalog-csit.yaml b/jjb/modeling/modeling-etsicatalog-csit.yaml deleted file mode 100644 index 76ebd4f20..000000000 --- a/jjb/modeling/modeling-etsicatalog-csit.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: modeling-etsicatalog-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'modeling-etsicatalog' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'modeling-etsicatalog-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master'
\ No newline at end of file diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml index bdb16ab4a..42a665727 100644 --- a/jjb/msb/msb-csit.yaml +++ b/jjb/msb/msb-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'msb' stream: 'master' + disabled: true functionality: - 'sanity-check': trigger_jobs: diff --git a/jjb/multicloud/multicloud-azure-csit.yaml b/jjb/multicloud/multicloud-azure-csit.yaml index 10946318a..3deb163b9 100644 --- a/jjb/multicloud/multicloud-azure-csit.yaml +++ b/jjb/multicloud/multicloud-azure-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'multicloud-azure' stream: 'master' + disabled: true functionality: - 'functionality1': trigger_jobs: 'multicloud-azure-master-docker-java-version-shell-daily' diff --git a/jjb/multicloud/multicloud-k8s-csit.yaml b/jjb/multicloud/multicloud-k8s-csit.yaml index a5a1540e7..84072303c 100644 --- a/jjb/multicloud/multicloud-k8s-csit.yaml +++ b/jjb/multicloud/multicloud-k8s-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'multicloud-k8s' stream: 'master' + disabled: true functionality: - 'functionality1': trigger_jobs: 'multicloud-k8s-master-docker-golang-shell-daily' diff --git a/jjb/multicloud/multicloud-k8s-kud-deployment.yaml b/jjb/multicloud/multicloud-k8s-kud-deployment.yaml deleted file mode 100644 index d5334647d..000000000 --- a/jjb/multicloud/multicloud-k8s-kud-deployment.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- project: - name: multicloud-k8s-kud-deployment - project: 'multicloud/k8s' - build-node: ubuntu1604-builder-4c-4g - kud_build_script: !include-raw-escape: kud-deployment.sh - - stream: - - 'master': - branch: 'master' - - jobs: - - '{name}-{stream}-shell-6hrs': - script: '{kud_build_script}' - diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index 4d368afbc..914c2bdac 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -11,6 +11,11 @@ - '{project-name}-{stream}-docker-golang-shell-daily': script: !include-raw-escape: 'build-multicloud-k8s-docker-image.sh' + - '{project-name}-{stream}-{area}-verify-shell': + area: kud-deployment + script: + !include-raw-escape: 'kud-deployment.sh' + build-node: ubuntu1604-builder-4c-4g project: 'multicloud/k8s' subproject: - validation-scripts: diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml index 2e3685680..180114a90 100644 --- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'multicloud-pike' stream: 'master' + disabled: true functionality: - 'functionality1': trigger_jobs: diff --git a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml index fa8dfd454..c24627634 100644 --- a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml @@ -5,6 +5,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'multicloud-windriver' stream: 'master' + disabled: true functionality: - 'functionality1': trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' diff --git a/jjb/music/music-csit.yaml b/jjb/music/music-csit.yaml index a0dbc8184..c0299f6d2 100644 --- a/jjb/music/music-csit.yaml +++ b/jjb/music/music-csit.yaml @@ -5,11 +5,10 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'music' + disabled: true stream: 'master' functionality: - 'music-test-plan': trigger_jobs: 'music-master-docker-version-java-daily' robot-options: '' branch: 'master' - - diff --git a/jjb/optf/optf-cmso-csit.yaml b/jjb/optf/optf-cmso-csit.yaml index ae0a790e5..4bf51652f 100644 --- a/jjb/optf/optf-cmso-csit.yaml +++ b/jjb/optf/optf-cmso-csit.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'cmso': trigger_jobs: 'optf-cmso-master-docker-java-version-shell-daily' diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index 2c2b24ddf..db919c0a0 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -24,7 +24,8 @@ mvn-params: '-Dmaven.test.skip=true' maven-properties: | cmso.registry=$ - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g build-node: ubuntu1604-docker-8c-8g project: 'optf/cmso' stream: diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml index 498878638..57bc512b2 100644 --- a/jjb/optf/optf-has-csit.yaml +++ b/jjb/optf/optf-has-csit.yaml @@ -5,6 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'optf-has' + disabled: true stream: - 'master': branch: master diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml index bb31f31dc..426186778 100644 --- a/jjb/optf/optf-osdf-csit.yaml +++ b/jjb/optf/optf-osdf-csit.yaml @@ -5,11 +5,10 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'optf-osdf' + disabled: true stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'osdf': trigger_jobs: 'optf-osdf-master-osdf-docker-java-version-shell-daily' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 048d95ef9..39785efa5 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -25,6 +25,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'policy-api-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 182604496..440e6407e 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -25,6 +25,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'policy-drools-pdp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index d2a7da091..aa6fb9600 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'policy-models-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index a9ab05f4b..6a8b08835 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -25,6 +25,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'policy-pap-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index a30790492..c723fff4c 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -25,6 +25,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'policy-xacml-pdp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml index 93cbf9fc9..a0679bbd5 100644 --- a/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml +++ b/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml @@ -5,6 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'vnfsdk-pkgtools' + disabled: true stream: 'master' functionality: - 'sanity-check': diff --git a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml index e34fd7403..9ff4e8509 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'vnfsdk-refrepo' stream: 'master' + disabled: true functionality: - 'sanity-check': trigger_jobs: '{project-name}-{stream}-merge-java' |