Merge "Add global semaphore support"

17 files changed, 233 insertions, 0 deletions

diff --git a/tests/fixtures/config/global-semaphores-config/broken.yaml b/tests/fixtures/config/global-semaphores-config/broken.yaml
new file mode 100644
index 000000000..f85494370
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores-config/broken.yaml
@@ -0,0 +1,10 @@
+- tenant:
+    name: tenant-two
+    semaphores:
+      - global-semaphore
+    source:
+      gerrit:
+        config-projects:
+          - common-config
+        untrusted-projects:
+          - org/project2
diff --git a/tests/fixtures/config/global-semaphores-config/git/common-config/playbooks/run.yaml b/tests/fixtures/config/global-semaphores-config/git/common-config/playbooks/run.yaml
new file mode 100644
index 000000000..ed97d539c
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores-config/git/common-config/playbooks/run.yaml
@@ -0,0 +1 @@
+---
diff --git a/tests/fixtures/config/global-semaphores-config/git/common-config/zuul.yaml b/tests/fixtures/config/global-semaphores-config/git/common-config/zuul.yaml
new file mode 100644
index 000000000..9dba55571
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores-config/git/common-config/zuul.yaml
@@ -0,0 +1,52 @@
+- pipeline:
+    name: check
+    manager: independent
+    trigger:
+      gerrit:
+        - event: patchset-created
+        - event: comment-added
+          comment: '^(Patch Set [0-9]+:\n\n)?(?i:recheck)$'
+    success:
+      gerrit:
+        Verified: 1
+    failure:
+      gerrit:
+        Verified: -1
+
+- pipeline:
+    name: gate
+    manager: dependent
+    success-message: Build succeeded (gate).
+    trigger:
+      gerrit:
+        - event: comment-added
+          approval:
+            - Approved: 1
+    success:
+      gerrit:
+        Verified: 2
+        submit: true
+    failure:
+      gerrit:
+        Verified: -2
+    start:
+      gerrit:
+        Verified: 0
+    precedence: high
+
+- job:
+    name: base
+    parent: null
+    run: playbooks/run.yaml
+
+- semaphore:
+    name: common-semaphore
+    max: 10
+
+- job:
+    name: test-global-semaphore
+    semaphores: global-semaphore
+
+- job:
+    name: test-common-semaphore
+    semaphores: common-semaphore
diff --git a/tests/fixtures/config/global-semaphores-config/git/org_project1/README b/tests/fixtures/config/global-semaphores-config/git/org_project1/README
new file mode 100644
index 000000000..9daeafb98
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores-config/git/org_project1/README
@@ -0,0 +1 @@
+test
diff --git a/tests/fixtures/config/global-semaphores-config/git/org_project1/zuul.yaml b/tests/fixtures/config/global-semaphores-config/git/org_project1/zuul.yaml
new file mode 100644
index 000000000..a4d823b1b
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores-config/git/org_project1/zuul.yaml
@@ -0,0 +1,19 @@
+# Not actually the global semaphore -- this will be overridden
+- semaphore:
+    name: global-semaphore
+    max: 2
+
+- semaphore:
+    name: project1-semaphore
+    max: 11
+
+- job:
+    name: test-project1-semaphore
+    semaphores: project1-semaphore
+
+- project:
+    check:
+      jobs:
+        - test-global-semaphore
+        - test-common-semaphore
+        - test-project1-semaphore
diff --git a/tests/fixtures/config/global-semaphores-config/git/org_project2/README b/tests/fixtures/config/global-semaphores-config/git/org_project2/README
new file mode 100644
index 000000000..9daeafb98
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores-config/git/org_project2/README
@@ -0,0 +1 @@
+test
diff --git a/tests/fixtures/config/global-semaphores-config/git/org_project2/zuul.yaml b/tests/fixtures/config/global-semaphores-config/git/org_project2/zuul.yaml
new file mode 100644
index 000000000..a0cdb39b9
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores-config/git/org_project2/zuul.yaml
@@ -0,0 +1,14 @@
+- semaphore:
+    name: project2-semaphore
+    max: 12
+
+- job:
+    name: test-project2-semaphore
+    semaphores: project2-semaphore
+
+- project:
+    check:
+      jobs:
+        - test-global-semaphore
+        - test-common-semaphore
+        - test-project2-semaphore
diff --git a/tests/fixtures/config/global-semaphores-config/git/org_project3/README b/tests/fixtures/config/global-semaphores-config/git/org_project3/README
new file mode 100644
index 000000000..9daeafb98
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores-config/git/org_project3/README
@@ -0,0 +1 @@
+test
diff --git a/tests/fixtures/config/global-semaphores-config/git/org_project3/zuul.yaml b/tests/fixtures/config/global-semaphores-config/git/org_project3/zuul.yaml
new file mode 100644
index 000000000..44a60a004
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores-config/git/org_project3/zuul.yaml
@@ -0,0 +1,20 @@
+# Not actually the global semaphore -- this tenant doesn't have it, so
+# this semaphore will be used.
+- semaphore:
+    name: global-semaphore
+    max: 999
+
+- semaphore:
+    name: project3-semaphore
+    max: 13
+
+- job:
+    name: test-project3-semaphore
+    semaphores: project3-semaphore
+
+- project:
+    check:
+      jobs:
+        - test-global-semaphore
+        - test-common-semaphore
+        - test-project3-semaphore
diff --git a/tests/fixtures/config/global-semaphores-config/main.yaml b/tests/fixtures/config/global-semaphores-config/main.yaml
new file mode 100644
index 000000000..8cb74bc18
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores-config/main.yaml
@@ -0,0 +1,34 @@
+- global-semaphore:
+    name: global-semaphore
+    max: 100
+
+- tenant:
+    name: tenant-one
+    semaphores:
+      - global-semaphore
+    source:
+      gerrit:
+        config-projects:
+          - common-config
+        untrusted-projects:
+          - org/project1
+
+- tenant:
+    name: tenant-two
+    semaphores:
+      - global-semaphore
+    source:
+      gerrit:
+        config-projects:
+          - common-config
+        untrusted-projects:
+          - org/project2
+
+- tenant:
+    name: tenant-three
+    source:
+      gerrit:
+        config-projects:
+          - common-config
+        untrusted-projects:
+          - org/project3
diff --git a/tests/fixtures/config/global-semaphores/git/common-config/playbooks/run.yaml b/tests/fixtures/config/global-semaphores/git/common-config/playbooks/run.yaml
new file mode 100644
index 000000000..ed97d539c
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores/git/common-config/playbooks/run.yaml
@@ -0,0 +1 @@
+---
diff --git a/tests/fixtures/config/global-semaphores/git/common-config/zuul.yaml b/tests/fixtures/config/global-semaphores/git/common-config/zuul.yaml
new file mode 100644
index 000000000..48b9e9c92
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores/git/common-config/zuul.yaml
@@ -0,0 +1,44 @@
+- pipeline:
+    name: check
+    manager: independent
+    trigger:
+      gerrit:
+        - event: patchset-created
+        - event: comment-added
+          comment: '^(Patch Set [0-9]+:\n\n)?(?i:recheck)$'
+    success:
+      gerrit:
+        Verified: 1
+    failure:
+      gerrit:
+        Verified: -1
+
+- pipeline:
+    name: gate
+    manager: dependent
+    success-message: Build succeeded (gate).
+    trigger:
+      gerrit:
+        - event: comment-added
+          approval:
+            - Approved: 1
+    success:
+      gerrit:
+        Verified: 2
+        submit: true
+    failure:
+      gerrit:
+        Verified: -2
+    start:
+      gerrit:
+        Verified: 0
+    precedence: high
+
+- job:
+    name: base
+    parent: null
+    run: playbooks/run.yaml
+
+- job:
+    name: test-global-semaphore
+    semaphores: global-semaphore
diff --git a/tests/fixtures/config/global-semaphores/git/org_project1/README b/tests/fixtures/config/global-semaphores/git/org_project1/README
new file mode 100644
index 000000000..9daeafb98
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores/git/org_project1/README
@@ -0,0 +1 @@
+test
diff --git a/tests/fixtures/config/global-semaphores/git/org_project1/zuul.yaml b/tests/fixtures/config/global-semaphores/git/org_project1/zuul.yaml
new file mode 100644
index 000000000..a05bdb237
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores/git/org_project1/zuul.yaml
@@ -0,0 +1,4 @@
+- project:
+    check:
+      jobs:
+        - test-global-semaphore
diff --git a/tests/fixtures/config/global-semaphores/git/org_project2/README b/tests/fixtures/config/global-semaphores/git/org_project2/README
new file mode 100644
index 000000000..9daeafb98
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores/git/org_project2/README
@@ -0,0 +1 @@
+test
diff --git a/tests/fixtures/config/global-semaphores/git/org_project2/zuul.yaml b/tests/fixtures/config/global-semaphores/git/org_project2/zuul.yaml
new file mode 100644
index 000000000..a05bdb237
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores/git/org_project2/zuul.yaml
@@ -0,0 +1,4 @@
+- project:
+    check:
+      jobs:
+        - test-global-semaphore
diff --git a/tests/fixtures/config/global-semaphores/main.yaml b/tests/fixtures/config/global-semaphores/main.yaml
new file mode 100644
index 000000000..719e3e12d
--- /dev/null
+++ b/tests/fixtures/config/global-semaphores/main.yaml
@@ -0,0 +1,25 @@
+- global-semaphore:
+    name: global-semaphore
+    max: 1
+
+- tenant:
+    name: tenant-one
+    semaphores:
+      - global-semaphore
+    source:
+      gerrit:
+        config-projects:
+          - common-config
+        untrusted-projects:
+          - org/project1
+
+- tenant:
+    name: tenant-two
+    semaphores:
+      - global-semaphore
+    source:
+      gerrit:
+        config-projects:
+          - common-config
+        untrusted-projects:
+          - org/project2