Merge pull request #2 from nurturenature/refactor-actions

refactor actions' matrices
nurturenature · Aug 22, 2024 · 0ac7025 · 0ac7025
2 parents c99510e + d8b9bf9
commit 0ac7025
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 61 deletions.
diff --git a/.github/workflows/active-active-matrix.yml b/.github/workflows/active-active-matrix.yml
@@ -6,16 +6,3 @@ on:
 jobs:
   active-active-matrix:
     uses: nurturenature/jepsen-powersync/.github/workflows/run-jepsen-tests.yml@main
-    with:
-      workloads: >
-        [ 'powersync' ]
-      backend-connectors: >
-        [ 'CrudTransactionConnector']
-      nemeses: >
-        [ 'none' ]
-      rates: >
-        [ '10', '20', '30', '40', '50' ]
-      time-limits: >
-        ['100', '200', '300', '400', '500' ]
-      cli-opts: >
-        '--nodes n1,n2,n3,n4,n5 --postgres-nodes n1'
diff --git a/.github/workflows/convergence-matrix.yml b/.github/workflows/convergence-matrix.yml
@@ -9,11 +9,3 @@ jobs:
     with:
       workloads: >
         [ 'convergence' ]
-      backend-connectors: >
-        [ 'CrudTransactionConnector']
-      nemeses: >
-        [ 'none' ]
-      rates: >
-        [ '25', '50', '75', '100' ]
-      time-limits: >
-        ['30', '60', '100' ]
diff --git a/.github/workflows/disconnect-connect-matrix.yml b/.github/workflows/disconnect-connect-matrix.yml
@@ -7,13 +7,5 @@ jobs:
   disconnect-connect-matrix:
     uses: nurturenature/jepsen-powersync/.github/workflows/run-jepsen-tests.yml@main
     with:
-      workloads: >
-        [ 'powersync' ]
-      backend-connectors: >
-        [ 'CrudTransactionConnector']
       nemeses: >
         [ 'disconnect-connect' ]
-      rates: >
-        [ '25', '50', '75', '100' ]
-      time-limits: >
-        ['60', '120', '180' ]
diff --git a/.github/workflows/partition-matrix.yml b/.github/workflows/partition-matrix.yml
@@ -7,13 +7,5 @@ jobs:
   partition-matrix:
     uses: nurturenature/jepsen-powersync/.github/workflows/run-jepsen-tests.yml@main
     with:
-      workloads: >
-        [ 'powersync' ]
-      backend-connectors: >
-        [ 'CrudTransactionConnector']
       nemeses: >
         [ 'partition-sync' ]
-      rates: >
-        [ '25', '50', '75', '100' ]
-      time-limits: >
-        ['60', '120', '180' ]
diff --git a/.github/workflows/pause-kill-matrix.yml b/.github/workflows/pause-kill-matrix.yml
@@ -7,13 +7,5 @@ jobs:
   pause-kill-matrix:
     uses: nurturenature/jepsen-powersync/.github/workflows/run-jepsen-tests.yml@main
     with:
-      workloads: >
-        [ 'powersync' ]
-      backend-connectors: >
-        [ 'CrudTransactionConnector']
       nemeses: >
         [ 'pause', 'kill' ]
-      rates: >
-        [ '25', '50', '75', '100' ]
-      time-limits: >
-        ['60', '120', '180' ]
diff --git a/.github/workflows/run-jepsen-tests.yml b/.github/workflows/run-jepsen-tests.yml
@@ -6,28 +6,28 @@ on:
       workloads:
         description: Workloads (as JSON)
         type: string
-        required: true
+        required: false
         default: "[ 'powersync' ]"
       backend-connectors:
         description: Backend connector classes (as JSON)
         type: string
-        required: true
+        required: false
         default: "[ 'CrudTransactionConnector' ]"
       nemeses:
         description: 'Nemeses (as JSON)'
         type: string
-        required: true
+        required: false
         default: "[ 'none' ]"
       rates:
         description: 'Rates (as JSON)'
         type: string
-        required: true
-        default: "[ '150' ]"
+        required: false
+        default: "[ '10', '20', '30', '40', '50' ]"
       time-limits:
         description: 'Timelimits (as JSON)'
         type: string
-        required: true
-        default: "[ '100' ]"
+        required: false
+        default: "[ '100', '200', '300', '400', '500', '600']"
       cli-opts:
         description: 'CLI opts string'
         type: string
@@ -39,33 +39,34 @@ on:
       workloads:
         description: 'Workloads (as JSON)'
         type: string
-        required: true
+        required: false
         default: "[ 'powersync' ]"
       backend-connectors:
         description: Backend connector classes (as JSON)
         type: string
-        required: true
+        required: false
         default: "[ 'CrudTransactionConnector' ]"
       nemeses:
         description: 'Nemeses (as JSON)'
         type: string
-        required: true
+        required: false
         default: "[ 'none' ]"
       rates:
         description: 'Rates (as JSON)'
         type: string
-        required: true
-        default: "[ '150' ]"
+        required: false
+        default: "[ '10', '20', '30', '40', '50' ]"
       time-limits:
         description: 'Timelimits (as JSON)'
         type: string
-        required: true
-        default: "[ '100' ]"
+        required: false
+        default: "[ '100', '200', '300', '400', '500', '600']"
       cli-opts:
         description: 'CLI opts string'
         type: string
         required: false
         default: --nodes n1,n2,n3,n4,n5 --postgres-nodes n1
+
 jobs:
   tests:
     runs-on: ubuntu-latest

diff --git a/jepsen/src/powersync/cli.clj b/jepsen/src/powersync/cli.clj
@@ -93,8 +93,8 @@
                    :faults     (:nemesis opts)
                    :disconnect-connect {:targets [:majority]}
                    :partition-sync     {:targets [:majority]}
-                   :pause      {:targets [:minority]}
-                   :kill       {:targets [:minority]}
+                   :pause      {:targets [:majority]}
+                   :kill       {:targets [:majority]}
                    :interval   (:nemesis-interval opts)})]
     (merge tests/noop-test
            opts