From: Trevor Bramwell Date: Tue, 30 Nov 2021 16:35:34 +0000 (+0000) Subject: Merge "using global tox verify job" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9b755e2d6458afec266bd8eb5ebd06083bc11d2c;hp=7b8b640fc0e225e37bae0b494bb0451822d66d27;p=releng.git Merge "using global tox verify job" --- diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index e00ba7361..a894b0a28 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -22,8 +22,8 @@ from: build_args: branch: stable/xena - slave: laas-xena - DASHBOARD_URL: http://10.200.120.76 + slave: lf-pod4-2 + DASHBOARD_URL: http://172.30.12.85 dependency: 3.14 - wallaby: from: diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index aea1cdaea..e565ea7a0 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -38,6 +38,9 @@ receivers: > luc.provoost@intel.com yury.kylulin@intel.com + vineperf-receivers: &vineperf-receivers + receivers: > + sridhar.rao@spirent.com other-receivers: &other-receivers receivers: '' @@ -180,6 +183,36 @@ dockerdir: 'VNFs/DPPD-PROX/helper-scripts/rapid' <<: *master <<: *samplevnf-receivers + - 'vineperf': + project: 'vineperf' + dockerdir: 'tools/docker/vineperf' + <<: *master + <<: *vineperf-receivers + - 'vineperf-prox': + project: 'vineperf' + dockerdir: 'tools/docker/test-containers/trafficgen-pods/prox' + <<: *master + <<: *vineperf-receivers + - 'vineperf-trex': + project: 'vineperf' + dockerdir: 'tools/docker/test-containers/trafficgen-pods/trex' + <<: *master + <<: *vineperf-receivers + - 'vineperf-pktgen': + project: 'vineperf' + dockerdir: 'tools/docker/test-containers/trafficgen-pods/pktgen' + <<: *master + <<: *vineperf-receivers + - 'vineperf-l2l3fwd': + project: 'vineperf' + dockerdir: 'tools/docker/test-containers/dpdk-forwarding-pods/l2l3fwd' + <<: *master + <<: *vineperf-receivers + - 'vineperf-vpp': + project: 'vineperf' + dockerdir: 'tools/docker/test-containers/dpdk-forwarding-pods/vpp' + <<: *master + <<: *vineperf-receivers # projects with jobs for hunter - 'dovetail': diff --git a/jjb/vineperf/vineperf-rtd-jobs.yaml b/jjb/vineperf/vineperf-rtd-jobs.yaml new file mode 100644 index 000000000..5f9c8527f --- /dev/null +++ b/jjb/vineperf/vineperf-rtd-jobs.yaml @@ -0,0 +1,29 @@ +--- +- project: + name: vineperf-rtd + project: vineperf + project-name: vineperf + + gerrit-skip-vote: true + project-pattern: 'vineperf' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-vineperf/47398/' + rtd-token: '47bbe5675e6cc5a6207fcc9b4db8dac03c27d9de' + + stream: + - master: + branch: '{stream}' + disabled: false + - jerma: &jerma + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - hunter: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/vineperf/vineperf-views.yaml b/jjb/vineperf/vineperf-views.yaml new file mode 100644 index 000000000..1f5348f92 --- /dev/null +++ b/jjb/vineperf/vineperf-views.yaml @@ -0,0 +1,6 @@ +--- +- project: + name: vineperf-view + views: + - project-view + project-name: vineperf diff --git a/jjb/vineperf/vineperf.yaml b/jjb/vineperf/vineperf.yaml new file mode 100644 index 000000000..74ea0e769 --- /dev/null +++ b/jjb/vineperf/vineperf.yaml @@ -0,0 +1,207 @@ +--- +- project: + + name: vineperf + + project: '{name}' + + jobs: + - 'vineperf-verify-{stream}' + - 'vineperf-merge-{stream}' + - 'vineperf-daily-{stream}' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + - jerma: &jerma + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - hunter: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - fraser: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + +- job-template: + + name: 'vineperf-daily-{stream}' + + disabled: '{obj:disabled}' + + properties: + - logrotate-default + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'vineperf-verify-.*' + - 'vineperf-merge-.*' + - 'vineperf-daily-.*' + blocking-level: 'NODE' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - 'intel-pod12-defaults' + + scm: + - git-scm + + triggers: + - pollscm: + cron: '@midnight' + + builders: + - shell: | + pwd + cd src + make clobber + make MORE_MAKE_FLAGS="-j 10" + cd ../ci + scl enable rh-python34 "source ~/vsperfenv/bin/activate ; ./build-vsperf.sh daily" + +- job-template: + name: 'vineperf-verify-{stream}' + + disabled: '{obj:disabled}' + + project-type: freestyle + + concurrent: true + + properties: + - logrotate-default + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'vineperf-verify-.*' + - 'vineperf-merge-.*' + - 'vineperf-daily-.*' + blocking-level: 'NODE' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod12 + default-slaves: + - intel-pod12 + + scm: + - git-scm-gerrit + + triggers: + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + disable-strict-forbidden-file-verification: 'true' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' + + builders: + - shell: | + pwd + cd src + make clobber + make MORE_MAKE_FLAGS="-j 5" + cd ../ci + ./build-vsperf.sh verify + +- job-template: + name: 'vineperf-merge-{stream}' + + disabled: '{obj:disabled}' + + project-type: freestyle + + concurrent: true + + properties: + - logrotate-default + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'vineperf-verify-.*' + - 'vineperf-merge-.*' + - 'vineperf-daily-.*' + blocking-level: 'NODE' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod12 + default-slaves: + - intel-pod12 + + scm: + - git-scm + + triggers: + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + disable-strict-forbidden-file-verification: 'true' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' + + builders: + - shell: | + pwd + cd src + make clobber + make MORE_MAKE_FLAGS="-j 5" + cd ../ci + ./build-vsperf.sh merge