From dda03277f0a81554b84488b5b880ae232f751466 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 8 Feb 2017 07:42:53 -0500 Subject: [PATCH] Step #3 - Retiring nova-docker Removing project ACL, jobs, channels Change-Id: I73c07d75dde2231b876ef9aeb4a09d2f26256bf7 --- accessbot/channels.yaml | 2 -- gerrit/acls/openstack/nova-docker.config | 17 ++------- gerritbot/channels.yaml | 10 ------ jenkins/jobs/nova-docker.yaml | 46 ------------------------ jenkins/jobs/projects.yaml | 11 ------ zuul/layout.yaml | 5 --- 6 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 jenkins/jobs/nova-docker.yaml diff --git a/accessbot/channels.yaml b/accessbot/channels.yaml index 5eff0a88dc..40f730643a 100755 --- a/accessbot/channels.yaml +++ b/accessbot/channels.yaml @@ -74,8 +74,6 @@ channels: mask: full_mask - name: murano mask: full_mask - - name: nova-docker - mask: full_mask - name: openstack - name: openstack-101 - name: openstack-ailuropoda diff --git a/gerrit/acls/openstack/nova-docker.config b/gerrit/acls/openstack/nova-docker.config index bff50f9880..9e7a0f50b2 100644 --- a/gerrit/acls/openstack/nova-docker.config +++ b/gerrit/acls/openstack/nova-docker.config @@ -1,15 +1,2 @@ -[access "refs/heads/*"] -abandon = group nova-docker-core -create = group nova-docker-core -label-Code-Review = -2..+2 group nova-docker-core -label-Workflow = -1..+1 group nova-docker-core - -[access "refs/tags/*"] -pushSignedTag = group nova-docker-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true +[project] +state = read only diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index e41766042f..1145338eb1 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -220,16 +220,6 @@ murano: branches: - master -nova-docker: - events: - - patchset-created - - change-merged - - x-vrif-minus-2 - projects: - - openstack/nova-docker - branches: - - master - openstack-ailuropoda: events: - patchset-created diff --git a/jenkins/jobs/nova-docker.yaml b/jenkins/jobs/nova-docker.yaml deleted file mode 100644 index cade3b8216..0000000000 --- a/jenkins/jobs/nova-docker.yaml +++ /dev/null @@ -1,46 +0,0 @@ -- job-template: - name: 'gate-tempest-dsvm-docker-{node}-nv' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 70 - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - - shell: | - #!/bin/bash -xe - function gate_hook {{ - $BASE/new/nova-docker/contrib/devstack/gate_hook.sh - }} - - export -f gate_hook - - function pre_test_hook {{ - if [ -f $BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh ] ; then - $BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh - fi - }} - - export -f pre_test_hook - - function post_test_hook {{ - if [ -f $BASE/new/nova-docker/contrib/devstack/post_test_hook.sh ] ; then - $BASE/new/nova-docker/contrib/devstack/post_test_hook.sh - fi - }} - - export -f post_test_hook - - export PYTHONUNBUFFERED=true - export PROJECTS="openstack/nova-docker $PROJECTS" - - 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/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 2bf68d85d7..5cdeda8a01 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -8115,17 +8115,6 @@ suffix: '-nv' branch-override: default -- project: - name: nova-docker - - jobs: - - python-jobs - - 'gate-tempest-dsvm-docker-{node}-nv': - node: - - ubuntu-trusty - - ubuntu-xenial - - centos-7 - - project: name: nova-dpm diff --git a/zuul/layout.yaml b/zuul/layout.yaml index b562ddba87..ff8a933478 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -12825,11 +12825,6 @@ projects: - gate-tempest-dsvm-full-devstack-plugin-nfs-nv - gate-tripleo-ci-centos-7-nonha-multinode - - name: openstack/nova-docker - template: - - name: merge-check - - name: noop-jobs - - name: openstack/nova-dpm template: - name: merge-check