b9a6190a45
This adds the concept of a 'scheme' to the merger. Up to this point, the merger has used the 'golang' scheme in all cases. However it is possible with Gerrit to create a set of git repositories which collide with each other using that scheme: root/example.com/component root/example.com/component/subcomponent The users which brought this to our attention intend to use their repos in a flat layout, like: root/component root/subcomponent To resolve this we need to do two things: avoid collisions in all cases in the internal git repo caches of the mergers and executors, and give users options to resolve collisions in workspace checkouts. In this change, mergers are updated to support three schemes: * golang (the current behavior) * flat (new behavior described above) * unique The unique scheme is not intended to be user-visible. It produces a truly unique and non-conflicting name by using urllib.quote_plus. It sacrifices legibility in order to obtain uniqueness. The mergers and executors are updated to use the unique scheme in their internal repo caches. A new job attribute, 'workspace-scheme' is added to allow the user to select between 'golang' and 'flat' when Zuul prepares the repos for checkout. There is one more kind of repo that Zuul prepares: the playbook repo. Each project that supplies a playbook to a job gets a copy of its repo checked out into a dedicated directory (with no sibling repos). In that case there is no risk of collision, and so we retain the current behavior of using the golang scheme for these checkouts. This allows the playbook paths to continue to be self-explanatory. For example: trusted/project_0/example.com/org/project/playbooks/run.yaml Documentation and a release note are added as well. Change-Id: I3fa1fd3c04626bfb7159aefce0f4dcb10bbaf5d9
105 lines
4.6 KiB
Python
105 lines
4.6 KiB
Python
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import os
|
|
|
|
from tests.base import AnsibleZuulTestCase
|
|
|
|
|
|
class TestOpenStack(AnsibleZuulTestCase):
|
|
# A temporary class to experiment with how openstack can use
|
|
# Zuulv3
|
|
|
|
tenant_config_file = 'config/openstack/main.yaml'
|
|
|
|
def test_nova_master(self):
|
|
A = self.fake_gerrit.addFakeChange('openstack/nova', 'master', 'A')
|
|
A.addApproval('Code-Review', 2)
|
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
|
self.waitUntilSettled()
|
|
self.assertEqual(self.getJobFromHistory('python27').result,
|
|
'SUCCESS')
|
|
self.assertEqual(self.getJobFromHistory('python35').result,
|
|
'SUCCESS')
|
|
self.assertEqual(A.data['status'], 'MERGED')
|
|
self.assertEqual(A.reported, 2,
|
|
"A should report start and success")
|
|
self.assertEqual(self.getJobFromHistory('python27').node,
|
|
'ubuntu-xenial')
|
|
|
|
def test_nova_mitaka(self):
|
|
self.create_branch('openstack/nova', 'stable/mitaka')
|
|
A = self.fake_gerrit.addFakeChange('openstack/nova',
|
|
'stable/mitaka', 'A')
|
|
A.addApproval('Code-Review', 2)
|
|
self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
|
|
self.waitUntilSettled()
|
|
self.assertEqual(self.getJobFromHistory('python27').result,
|
|
'SUCCESS')
|
|
self.assertEqual(self.getJobFromHistory('python35').result,
|
|
'SUCCESS')
|
|
self.assertEqual(A.data['status'], 'MERGED')
|
|
self.assertEqual(A.reported, 2,
|
|
"A should report start and success")
|
|
self.assertEqual(self.getJobFromHistory('python27').node,
|
|
'ubuntu-trusty')
|
|
|
|
def test_dsvm_keystone_repo(self):
|
|
self.executor_server.keep_jobdir = True
|
|
A = self.fake_gerrit.addFakeChange('openstack/nova', 'master', 'A')
|
|
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
|
|
self.waitUntilSettled()
|
|
|
|
self.assertHistory([
|
|
dict(name='dsvm', result='SUCCESS', changes='1,1')])
|
|
build = self.getJobFromHistory('dsvm')
|
|
|
|
# Check that a change to nova triggered a keystone clone
|
|
executor_git_dir = os.path.join(self.executor_src_root,
|
|
'review.example.com',
|
|
'openstack', 'openstack%2Fkeystone',
|
|
'.git')
|
|
self.assertTrue(os.path.exists(executor_git_dir),
|
|
msg='openstack/keystone should be cloned.')
|
|
|
|
jobdir_git_dir = os.path.join(build.jobdir.src_root,
|
|
'review.example.com',
|
|
'openstack', 'keystone', '.git')
|
|
self.assertTrue(os.path.exists(jobdir_git_dir),
|
|
msg='openstack/keystone should be cloned.')
|
|
|
|
def test_dsvm_nova_repo(self):
|
|
self.executor_server.keep_jobdir = True
|
|
A = self.fake_gerrit.addFakeChange('openstack/keystone', 'master', 'A')
|
|
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
|
|
self.waitUntilSettled()
|
|
|
|
self.assertHistory([
|
|
dict(name='dsvm', result='SUCCESS', changes='1,1')])
|
|
build = self.getJobFromHistory('dsvm')
|
|
|
|
# Check that a change to keystone triggered a nova clone
|
|
executor_git_dir = os.path.join(self.executor_src_root,
|
|
'review.example.com',
|
|
'openstack', 'openstack%2Fnova',
|
|
'.git')
|
|
self.assertTrue(os.path.exists(executor_git_dir),
|
|
msg='openstack/nova should be cloned.')
|
|
|
|
jobdir_git_dir = os.path.join(build.jobdir.src_root,
|
|
'review.example.com',
|
|
'openstack', 'nova', '.git')
|
|
self.assertTrue(os.path.exists(jobdir_git_dir),
|
|
msg='openstack/nova should be cloned.')
|