From 241c77bc97558289698b8fc1615cf198cdd839fe Mon Sep 17 00:00:00 2001 From: Kun Huang Date: Fri, 23 Oct 2015 17:30:36 +0800 Subject: [PATCH] new-project: openstack/scalpels Request to migrate to openstack/ from github with: * basic setup for independent project * basic setup for python/pypi jobs * a setup for neuton dsvm Change-Id: I581ade278cc9182de656f0b400a837f835bcb71e --- accessbot/channels.yaml | 1 + gerrit/acls/openstack/scalpels.config | 14 +++++++++ gerrit/projects.yaml | 3 ++ gerritbot/channels.yaml | 10 ++++++ jenkins/jobs/projects.yaml | 14 +++++++++ jenkins/jobs/scalpels.yaml | 45 +++++++++++++++++++++++++++ zuul/layout.yaml | 13 ++++++++ 7 files changed, 100 insertions(+) create mode 100644 gerrit/acls/openstack/scalpels.config create mode 100644 jenkins/jobs/scalpels.yaml diff --git a/accessbot/channels.yaml b/accessbot/channels.yaml index fd394f2fce..5401dc0431 100755 --- a/accessbot/channels.yaml +++ b/accessbot/channels.yaml @@ -159,6 +159,7 @@ channels: - name: openstack-relmgr-office - name: openstack-rpm-packaging - name: openstack-sahara + - name: openstack-scalpels - name: openstack-sdks - name: openstack-security - name: openstack-searchlight diff --git a/gerrit/acls/openstack/scalpels.config b/gerrit/acls/openstack/scalpels.config new file mode 100644 index 0000000000..d9b19f80a3 --- /dev/null +++ b/gerrit/acls/openstack/scalpels.config @@ -0,0 +1,14 @@ +[access "refs/heads/*"] +abandon = group scalpels-core +label-Code-Review = -2..+2 group scalpels-core +label-Workflow = -1..+1 group scalpels-core + +[access "refs/tags/*"] +pushSignedTag = group scalpels-release + +[receive] +requireChangeId = true +requireContributorAgreement = true + +[submit] +mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index d6e079c84f..568c380996 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -2543,6 +2543,9 @@ groups: - sahara description: Sahara Specifications +- project: openstack/scalpels + description: Digging and Tracing system for OpenStack + upstream: https://github.com/pyKun/Scalpels - project: openstack/searchlight description: OpenStack Search (Searchlight) options: diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 5d795db26e..cff5ab06f3 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -1339,6 +1339,16 @@ openstack-sahara: - stable/kilo - stable/juno +openstack-scalpels: + events: + - patchset-created + - change-merged + - x-vrif-minus-2 + projects: + - openstack/scalpels + branches: + - master + openstack-sdks: events: - patchset-created diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 6247c4a711..5440c6e49d 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -5985,6 +5985,20 @@ jobs: - specs-jobs +- project: + name: scalpels + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - pypi-jobs + - '{pipeline}-scalpels-dsvm-neutron{branch-designator}': + pipeline: gate + node: 'devstack-precise || devstack-trusty' + branch-designator: '' + branch-override: default + - project: name: searchlight node: 'bare-precise || bare-trusty' diff --git a/jenkins/jobs/scalpels.yaml b/jenkins/jobs/scalpels.yaml new file mode 100644 index 0000000000..d08fd7a9c1 --- /dev/null +++ b/jenkins/jobs/scalpels.yaml @@ -0,0 +1,45 @@ +- job-template: + name: '{pipeline}-scalpels-dsvm-neutron{branch-designator}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 125 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + # Start with the base set of services + ENABLED_SERVICES=mysql,rabbit,key,tempest,g-api,g-reg, + # Add Nova services (except for nova-network) + ENABLED_SERVICES+=n-api,n-cond,n-cpu,n-crt,n-obj,n-sch + # Enable Neutron + ENABLED_SERVICES+=q-svc,q-dhcp,q-meta,q-l3,q-agt + export ENABLED_SERVICES + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_NEUTRON=1 + export DEVSTACK_GATE_TEMPEST_FULL=1 + export DEVSTACK_GATE_NEUTRON_DVR=1 + export BRANCH_OVERRIDE={branch-override} + export PROJECTS="openstack/scalpels $PROJECTS" + export DEVSTACK_LOCAL_CONFIG="enable_plugin scalpels https://git.openstack.org/openstack/scalpels" + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + function post_test_hook {{ + $BASE/new/scalpels/tests/ci/scalpels-ci.sh + }} + + export -f post_test_hook + + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + publishers: + - devstack-logs + - console-log diff --git a/zuul/layout.yaml b/zuul/layout.yaml index f4580c57ee..96919c266c 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1952,6 +1952,9 @@ jobs: - name: gate-senlin-dsvm-functional voting: false + - name: gate-scalpels-dsvm-neutron + voting: false + - name: gate-python-cueclient-python34 voting: false @@ -8225,6 +8228,16 @@ projects: gate: - gate-sahara-specs-python27 + - name: openstack/scalpels + template: + - name: merge-check + - name: python-jobs + - name: python3-jobs + - name: check-requirements + - name: publish-to-pypi + check: + - gate-scalpels-dsvm-neutron + - name: openstack/searchlight template: - name: merge-check