ci: add alpine/musl jobs to master and PR pipelines

also restructure pipelines to have a second gate related to #1990 and #1845
sparklemotion · Mar 29, 2020 · 7395d2a · 7395d2a
1 parent 2069ab7
commit 7395d2a
Show file tree

Hide file tree

Showing 4 changed files with 346 additions and 116 deletions.
diff --git a/concourse/nokogiri-pr.yml b/concourse/nokogiri-pr.yml
@@ -152,7 +152,7 @@ jobs:
         on_failure: { in_parallel: [*notify_failure_to_irc, *notify_failure_to_pr] }
 % end
 
-  - name: gate
+  - name: gate-1
     public: true
     plan:
       - get: nokogiri-pr
@@ -165,121 +165,158 @@ jobs:
           - "jruby-<%= RUBIES[:jruby].last %>"
 
 
-  - name: gem-test
+  - name: ruby-vanilla-system
     public: true
     serial: true
     plan:
       - get: ci
       - get: nokogiri-pr
         trigger: true
         version: every
-        passed: ["gate"]
-      - task: gem-build
+        passed: ["gate-1"]
+      - task: rake-test
         config:
           platform: linux
           image_resource:
             type: registry-image
-            source: {repository: "flavorjones/nokogiri-test", tag: "mri-<%= Concourse.production_rubies.last %>"}
+            source: {repository: "flavorjones/nokogiri-test", tag: bionic}
           inputs:
             - name: ci
             - name: nokogiri-pr
               path: nokogiri
-          outputs:
-            - name: gems
+          params:
+            NOKOGIRI_USE_SYSTEM_LIBRARIES: t
           run:
-            path: ci/concourse/tasks/gem-test/gem-build.sh
+            path: ci/concourse/tasks/rake-test/run.sh
         on_failure: { in_parallel: [*notify_failure_to_irc, *notify_failure_to_pr] }
-      - task: gem-install-and-test
+
+
+  - name: ruby-musl-system
+    public: true
+    serial: true
+    plan:
+      - get: ci
+      - get: nokogiri-pr
+        trigger: true
+        passed: ["gate-1"]
+      - task: rake-test
         config:
           platform: linux
           image_resource:
             type: registry-image
-            source: {repository: "flavorjones/nokogiri-test", tag: "mri-<%= Concourse.production_rubies.last %>"}
+            source: {repository: "flavorjones/nokogiri-test", tag: "alpine"}
           inputs:
             - name: ci
             - name: nokogiri-pr
               path: nokogiri
-            - name: gems
+          params:
+            NOKOGIRI_USE_SYSTEM_LIBRARIES: t
           run:
-            path: ci/concourse/tasks/gem-test/gem-install-and-test.sh
-        on_failure: { in_parallel: [*notify_failure_to_irc, *notify_failure_to_pr] }
+            path: ci/concourse/tasks/rake-test/run.sh
+        on_failure: *notify_failure_to_irc
 
-  - name: gem-test-java
+
+  - name: ruby-musl-valgrind
     public: true
     serial: true
     plan:
       - get: ci
       - get: nokogiri-pr
         trigger: true
-        version: every
-        passed: ["gate"]
-      - task: gem-build
+        passed: ["ruby-musl-system"]
+      - task: rake-test
         config:
           platform: linux
           image_resource:
             type: registry-image
-            source: {repository: "flavorjones/nokogiri-test", tag: "jruby-<%= RUBIES[:jruby].last %>"}
+            source: {repository: "flavorjones/nokogiri-test", tag: "alpine"}
           inputs:
             - name: ci
             - name: nokogiri-pr
               path: nokogiri
-          outputs:
-            - name: gems
+          params:
+            TEST_WITH_VALGRIND: t
           run:
-            path: ci/concourse/tasks/gem-test/gem-build-java.sh
-        on_failure: { in_parallel: [*notify_failure_to_irc, *notify_failure_to_pr] }
-      - task: gem-install-and-test
+            path: ci/concourse/tasks/rake-test/run.sh
+        on_failure: *notify_failure_to_irc
+
+
+  - name: ruby-libxmlruby-system
+    public: true
+    serial: true
+    plan:
+      - get: ci
+      - get: nokogiri-pr
+        trigger: true
+        version: every
+        passed: ["gate-1"]
+      - task: rake-test
         config:
           platform: linux
           image_resource:
             type: registry-image
-            source: {repository: "flavorjones/nokogiri-test", tag: "jruby-<%= RUBIES[:jruby].last %>"}
+            source: {repository: "flavorjones/nokogiri-test", tag: "mri-<%= Concourse.production_rubies.last %>"}
           inputs:
             - name: ci
             - name: nokogiri-pr
               path: nokogiri
-            - name: gems
+          params:
+            BUNDLE_GEMFILE: "Gemfile-libxml-ruby"
+            NOKOGIRI_USE_SYSTEM_LIBRARIES: t
           run:
-            path: ci/concourse/tasks/gem-test/gem-install-and-test.sh
+            path: ci/concourse/tasks/rake-test/run.sh
         on_failure: { in_parallel: [*notify_failure_to_irc, *notify_failure_to_pr] }
 
 
-  - name: ruby-vanilla-system
+  - name: ruby-libxmlruby-valgrind
     public: true
     serial: true
     plan:
       - get: ci
       - get: nokogiri-pr
         trigger: true
         version: every
-        passed: ["gate"]
+        passed: ["ruby-libxmlruby-system"]
       - task: rake-test
         config:
           platform: linux
           image_resource:
             type: registry-image
-            source: {repository: "flavorjones/nokogiri-test", tag: bionic}
+            source: {repository: "flavorjones/nokogiri-test", tag: "mri-<%= Concourse.production_rubies.last %>"}
           inputs:
             - name: ci
             - name: nokogiri-pr
               path: nokogiri
           params:
-            NOKOGIRI_USE_SYSTEM_LIBRARIES: t
+            BUNDLE_GEMFILE: "Gemfile-libxml-ruby"
+            TEST_WITH_VALGRIND: t
           run:
             path: ci/concourse/tasks/rake-test/run.sh
         on_failure: { in_parallel: [*notify_failure_to_irc, *notify_failure_to_pr] }
 
 
-  - name: ruby-libxmlruby-system
+  - name: gate-2
+    public: true
+    plan:
+      - get: nokogiri-pr
+        trigger: true
+        version: every
+        passed:
+          - ruby-vanilla-system
+          - ruby-libxmlruby-valgrind
+          - ruby-musl-valgrind
+
+
+  - name: gem-test
     public: true
     serial: true
     plan:
       - get: ci
       - get: nokogiri-pr
         trigger: true
         version: every
-        passed: ["gate"]
-      - task: rake-test
+        passed: ["gate-2"]
+      - task: gem-build
         config:
           platform: linux
           image_resource:
@@ -289,38 +326,63 @@ jobs:
             - name: ci
             - name: nokogiri-pr
               path: nokogiri
-          params:
-            BUNDLE_GEMFILE: "Gemfile-libxml-ruby"
-            NOKOGIRI_USE_SYSTEM_LIBRARIES: t
+          outputs:
+            - name: gems
           run:
-            path: ci/concourse/tasks/rake-test/run.sh
+            path: ci/concourse/tasks/gem-test/gem-build.sh
+        on_failure: { in_parallel: [*notify_failure_to_irc, *notify_failure_to_pr] }
+      - task: gem-install-and-test
+        config:
+          platform: linux
+          image_resource:
+            type: registry-image
+            source: {repository: "flavorjones/nokogiri-test", tag: "mri-<%= Concourse.production_rubies.last %>"}
+          inputs:
+            - name: ci
+            - name: nokogiri-pr
+              path: nokogiri
+            - name: gems
+          run:
+            path: ci/concourse/tasks/gem-test/gem-install-and-test.sh
         on_failure: { in_parallel: [*notify_failure_to_irc, *notify_failure_to_pr] }
 
-
-  - name: ruby-libxmlruby-valgrind
+  - name: gem-test-java
     public: true
     serial: true
     plan:
       - get: ci
       - get: nokogiri-pr
         trigger: true
         version: every
-        passed: ["gate"]
-      - task: rake-test
+        passed: ["gate-2"]
+      - task: gem-build
         config:
           platform: linux
           image_resource:
             type: registry-image
-            source: {repository: "flavorjones/nokogiri-test", tag: "mri-<%= Concourse.production_rubies.last %>"}
+            source: {repository: "flavorjones/nokogiri-test", tag: "jruby-<%= RUBIES[:jruby].last %>"}
           inputs:
             - name: ci
             - name: nokogiri-pr
               path: nokogiri
-          params:
-            BUNDLE_GEMFILE: "Gemfile-libxml-ruby"
-            TEST_WITH_VALGRIND: t
+          outputs:
+            - name: gems
           run:
-            path: ci/concourse/tasks/rake-test/run.sh
+            path: ci/concourse/tasks/gem-test/gem-build-java.sh
+        on_failure: { in_parallel: [*notify_failure_to_irc, *notify_failure_to_pr] }
+      - task: gem-install-and-test
+        config:
+          platform: linux
+          image_resource:
+            type: registry-image
+            source: {repository: "flavorjones/nokogiri-test", tag: "jruby-<%= RUBIES[:jruby].last %>"}
+          inputs:
+            - name: ci
+            - name: nokogiri-pr
+              path: nokogiri
+            - name: gems
+          run:
+            path: ci/concourse/tasks/gem-test/gem-install-and-test.sh
         on_failure: { in_parallel: [*notify_failure_to_irc, *notify_failure_to_pr] }
 
 
@@ -332,9 +394,6 @@ jobs:
         trigger: true
         version: every
         passed:
-          - ruby-vanilla-system
-          - ruby-libxmlruby-system
-          - ruby-libxmlruby-valgrind
           - gem-test
           - gem-test-java
       - put: nokogiri-pr