From 87bd7eb02655f66acb149fcb11a6ce4830a9d2d1 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 16 Jul 2013 16:12:55 -0700 Subject: [PATCH] Stop cherry-picking in infra We encountered some problems, notably, the updated commit message breaks "git brannch -d" workflow, and Sean Dague ran into problems with the implementation in Gerrit. Change-Id: I9f2d411bb9c926b3da919bb9ab986dd589f9f42c Reviewed-on: https://review.openstack.org/37348 Reviewed-by: Clark Boylan Approved: Monty Taylor Reviewed-by: Monty Taylor Tested-by: Jenkins --- .../files/gerrit/acls/openstack-infra/askbot-theme.config | 1 - .../files/gerrit/acls/openstack-infra/config.config | 1 - .../files/gerrit/acls/openstack-infra/gitdm.config | 1 - .../files/gerrit/acls/openstack-infra/jeepyb.config | 1 - .../files/gerrit/acls/openstack-infra/jenkins-job-builder.config | 1 - .../files/gerrit/acls/openstack-infra/odsreg.config | 1 - .../files/gerrit/acls/openstack-infra/puppet-apparmor.config | 1 - .../files/gerrit/acls/openstack-infra/puppet-dashboard.config | 1 - .../files/gerrit/acls/openstack-infra/puppet-vcsrepo.config | 1 - .../files/gerrit/acls/openstack-infra/releasestatus.config | 1 - .../files/gerrit/acls/openstack-infra/reviewday.config | 1 - .../files/gerrit/acls/openstack-infra/reviewstats.config | 1 - .../files/gerrit/acls/openstack-infra/zuul.config | 1 - .../files/gerrit/acls/test-manage-project.config | 1 - modules/openstack_project/files/zuul/layout-dev.yaml | 1 - modules/openstack_project/files/zuul/layout.yaml | 1 - 16 files changed, 16 deletions(-) diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/askbot-theme.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/askbot-theme.config index e50e94850d..cdb709cd18 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/askbot-theme.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/askbot-theme.config @@ -10,4 +10,3 @@ requireChangeId = true [submit] mergeContent = true - action = cherry pick diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/config.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/config.config index f532ca8c49..ff2a04f92e 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/config.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/config.config @@ -7,4 +7,3 @@ requireChangeId = true [submit] mergeContent = true - action = cherry pick diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gitdm.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/gitdm.config index a3cad70b6e..6f5125f1b7 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/gitdm.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/gitdm.config @@ -10,4 +10,3 @@ requireChangeId = true [submit] mergeContent = true - action = cherry pick diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config index 104d310bd3..852d60c5ef 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config @@ -10,4 +10,3 @@ requireChangeId = true [submit] mergeContent = true - action = cherry pick diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/jenkins-job-builder.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/jenkins-job-builder.config index eca426feb8..852d60c5ef 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/jenkins-job-builder.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/jenkins-job-builder.config @@ -9,5 +9,4 @@ [receive] requireChangeId = true [submit] - action = cherry pick mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/odsreg.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/odsreg.config index 87861e90b1..46c98d5b26 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/odsreg.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/odsreg.config @@ -11,4 +11,3 @@ requireContributorAgreement = true [submit] mergeContent = true - action = cherry pick diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config index 6e93ed15a9..110fe34f40 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config @@ -12,4 +12,3 @@ requireChangeId = true [submit] mergeContent = true - action = cherry pick diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config index 6e93ed15a9..110fe34f40 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config @@ -12,4 +12,3 @@ requireChangeId = true [submit] mergeContent = true - action = cherry pick diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config index 54eb974d3a..da70531305 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config @@ -15,4 +15,3 @@ requireChangeId = true [submit] mergeContent = true - action = cherry pick diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/releasestatus.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/releasestatus.config index eb80b82455..7df3ca336a 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/releasestatus.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/releasestatus.config @@ -10,4 +10,3 @@ requireChangeId = true [submit] mergeContent = true - action = cherry pick diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/reviewday.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/reviewday.config index b2a736ebee..250ed82986 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/reviewday.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/reviewday.config @@ -10,4 +10,3 @@ requireChangeId = true [submit] mergeContent = true - action = cherry pick diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/reviewstats.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/reviewstats.config index a3cad70b6e..6f5125f1b7 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/reviewstats.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/reviewstats.config @@ -10,4 +10,3 @@ requireChangeId = true [submit] mergeContent = true - action = cherry pick diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config index 8449409d7c..4284167863 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config @@ -12,4 +12,3 @@ requireChangeId = true [submit] mergeContent = true - action = cherry pick diff --git a/modules/openstack_project/files/gerrit/acls/test-manage-project.config b/modules/openstack_project/files/gerrit/acls/test-manage-project.config index 69c3ff0333..4bc34ee1af 100644 --- a/modules/openstack_project/files/gerrit/acls/test-manage-project.config +++ b/modules/openstack_project/files/gerrit/acls/test-manage-project.config @@ -9,7 +9,6 @@ requireShortMessage = true [submit] mergeContent = true - action = cherry pick [project] state = active [access "refs/meta/config"] diff --git a/modules/openstack_project/files/zuul/layout-dev.yaml b/modules/openstack_project/files/zuul/layout-dev.yaml index 37284df703..3c17da192c 100644 --- a/modules/openstack_project/files/zuul/layout-dev.yaml +++ b/modules/openstack_project/files/zuul/layout-dev.yaml @@ -122,7 +122,6 @@ projects: - gate-noop - name: openstack-infra/config - merge-mode: cherry-pick check: - config-compare-xml - gate-config-layout diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index e6952f4a23..9a1f02dd40 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -282,7 +282,6 @@ projects: - gate-noop - name: openstack-infra/config - merge-mode: cherry-pick check: - config-compare-xml - gate-config-layout