From 97f080e832e04d6ad805fa172d1645db6e7c77ea Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 28 Feb 2013 13:25:50 -0800 Subject: [PATCH] Add grenade. Import from nebula github. Add non-voting jobs to the immediately relevant projects to facilitate iterating on the config while we bootstrap it. Change-Id: I8c603bf095019f43d070b3b28ec7ee5114cd9ccf Reviewed-on: https://review.openstack.org/23209 Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- .../files/gerritbot_channel_config.yaml | 1 + .../gerrit/acls/openstack-dev/grenade.config | 15 ++++++++ .../config/devstack-gate.yaml | 37 +++++++++++++++++++ .../openstack_project/files/zuul/layout.yaml | 11 ++++++ .../templates/review.projects.yaml.erb | 3 ++ 5 files changed, 67 insertions(+) create mode 100644 modules/openstack_project/files/gerrit/acls/openstack-dev/grenade.config diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index f624b9414e..7a61f267bb 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -46,6 +46,7 @@ openstack-dev: - openstack/swift - openstack/tempest - openstack-dev/devstack + - openstack-dev/grenade - openstack-infra/devstack-gate branches: - master diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/grenade.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/grenade.config new file mode 100644 index 0000000000..ec6d72cad8 --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/grenade.config @@ -0,0 +1,15 @@ +[access "refs/heads/*"] + label-Code-Review = -2..+2 group devstack-core + label-Approved = +0..+1 group devstack-core +[access "refs/heads/stable/*"] + exclusiveGroupPermissions = label-Code-Review label-Approved + label-Code-Review = -2..+2 group devstack-core + label-Code-Review = -1..+1 group Registered Users + label-Approved = +0..+1 group devstack-core +[project] + state = active +[receive] + requireChangeId = true + requireContributorAgreement = true +[submit] + mergeContent = true diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 83ab4da857..16efdae6c5 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -451,6 +451,43 @@ - devstack-complete +- job: + name: gate-grenade-devstack-vm + node: devstack-precise + + wrappers: + - timeout: + timeout: 180 + fail: true + - timestamps + + parameters: + - label: + name: NODE_LABEL + description: Label of node to use for this build + default: devstack-precise + + triggers: + - zuul + + builders: + - devstack-inprogress + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=0 + export DEVSTACK_GATE_GRENADE=1 + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs + + publishers: + - devstack-logs + - console-log + - devstack-complete + + # Called by devstack jobs to alert that they have started so that the # jenkins slave they are running on can be disabled. - job: diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index f16ad0252a..9f8ad67bcf 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -79,6 +79,8 @@ jobs: voting: false - name: gate-tempest-devstack-vm-postgres-full branch: ^(?!stable/(diablo|essex|folsom)).*$ + - name: gate-grenade-devstack-vm + voting: false - name: ^.*-python27$ parameter-function: python27_params - name: gate-nova-pylint @@ -760,6 +762,13 @@ projects: gate: - gate-noop + - name: openstack-dev/grenade + check: + - gate-noop + - gate-grenade-devstack-vm + gate: + - gate-noop + - name: openstack-dev/devstack check: - gate-tempest-devstack-vm-smoke @@ -767,6 +776,7 @@ projects: - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-quantum + - gate-grenade-devstack-vm gate: - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -781,6 +791,7 @@ projects: - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-quantum + - gate-grenade-devstack-vm gate: - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb index 5b2333a08e..29b7bf7b49 100644 --- a/modules/openstack_project/templates/review.projects.yaml.erb +++ b/modules/openstack_project/templates/review.projects.yaml.erb @@ -36,6 +36,9 @@ description: OpenStack code review report generator - project: openstack-infra/zuul - project: openstack-dev/devstack +- project: openstack-dev/grenade + upstream: git://github.com/nebula/grenade + description: OpenStack upgrade testing tool - project: openstack-dev/openstack-nose - project: openstack-dev/openstack-qa - project: openstack-dev/sandbox