wercker.yml: improve parallelism of test-mjit and test-mjit-wait

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 67 insertions, 35 deletions

diff --git a/wercker.yml b/wercker.yml
index 973aa89fe2..0f00cc7a80 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -22,15 +22,6 @@ test-mjit:
     - script:
         name: make all install
         code: /usr/bin/sudo -H -u test -- make -j$(nproc) all install
-    - script:
-        name: make test (JIT)
-        code: /usr/bin/sudo -H -u test -- make test RUN_OPTS="--disable-gems --jit --jit-warnings"
-    - script:
-        name: make test-all (JIT)
-        code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit --jit-warnings" TESTOPTS="--color=never --job-status=normal --longest 10 --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit"
-    - script:
-        name: make test-spec (JIT)
-        code: /usr/bin/sudo -H -u test -- make test-spec RUN_OPTS="--disable-gems --jit --jit-warnings"
   after-steps:
     - wantedly/pretty-slack-notify:
       webhook_url: $SLACK_WEBHOOK_URL
@@ -39,7 +30,27 @@ test-mjit:
       notify_on: "failed"
       branches: ^trunk$
 
-test-mjit-wait:
+### Code to generate test-all definition with --jit-wait ###
+
+# allow_failures = ['test/webrick/']
+# index = 1
+# dirs = Dir.glob('test/*/').sort
+# dirs.each do |dir|
+#   puts <<-EOS
+#     - script:
+#         name: make test-all#{index} -- #{dir} (JIT wait)
+#         code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTS="#{dir}" TESTOPTS="--color=never --job-status=normal --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit-wait"#{(' || true' if allow_failures.include?(dir))}
+#   EOS
+#   index += 1
+# end
+# puts <<-EOS
+#     - script:
+#         name: make test-all#{index} -- others (JIT wait)
+#         code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTOPTS="#{dirs.map { |d| "--exclude #{d}" }.join(' ')} --color=never --job-status=normal --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit-wait"
+# EOS
+
+# --jit + first half of --jit-wait.
+test-mjit:
   steps:
     - install-packages:
         packages: bison sudo
@@ -55,29 +66,27 @@ test-mjit-wait:
     - script:
         name: make all install
         code: /usr/bin/sudo -H -u test -- make -j$(nproc) all install
+
+    # --jit
+    - script:
+        name: make test (JIT)
+        code: /usr/bin/sudo -H -u test -- make test RUN_OPTS="--disable-gems --jit --jit-warnings"
+    - script:
+        name: make test-spec (JIT)
+        code: /usr/bin/sudo -H -u test -- make test-spec RUN_OPTS="--disable-gems --jit --jit-warnings"
+    - script:
+        name: make test-all (JIT)
+        code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit --jit-warnings" TESTOPTS="--color=never --job-status=normal --longest 10 --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit"
+
+    # --jit-wait
     - script:
         name: make test (JIT wait)
         code: /usr/bin/sudo -H -u test -- make test RUN_OPTS="--disable-gems --jit-wait --jit-warnings"
+    - script:
+        name: make test-spec (JIT wait)
+        code: /usr/bin/sudo -H -u test -- make test-spec RUN_OPTS="--disable-gems --jit-wait --jit-warnings"
 
-    # allow_failures = ['test/webrick/']
-    # index = 1
-    # dirs = Dir.glob('test/*/').sort
-    # dirs.each do |dir|
-    #   puts <<-EOS
-    #     - script:
-    #         name: make test-all#{index} -- #{dir} (JIT wait)
-    #         code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTS="#{dir}" TESTOPTS="--color=never --job-status=normal --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit-wait"#{(' || true' if allow_failures.include?(dir))}
-    #   EOS
-    #   index += 1
-    # end
-    # puts <<-EOS
-    #     - script:
-    #         name: make test-all#{index} -- others (JIT wait)
-    #         code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTOPTS="#{dirs.map { |d| "--exclude #{d}" }.join(' ')} --color=never --job-status=normal --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit-wait"
-    # EOS
-
-    # -- AUTO GENERATED START (by above code) ---
-
+    # -- AUTO GENERATED 1st half START (by above code) ---
     - script:
         name: make test-all1 -- test/-ext-/ (JIT wait)
         code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTS="test/-ext-/" TESTOPTS="--color=never --job-status=normal --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit-wait"
@@ -168,6 +177,34 @@ test-mjit-wait:
     - script:
         name: make test-all30 -- test/nkf/ (JIT wait)
         code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTS="test/nkf/" TESTOPTS="--color=never --job-status=normal --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit-wait"
+    # -- AUTO GENERATED 1st half END ---
+  after-steps:
+    - wantedly/pretty-slack-notify:
+      webhook_url: $SLACK_WEBHOOK_URL
+      username: Wercker test-mjit-wait
+      channel: alerts
+      notify_on: "failed"
+      branches: ^trunk$
+
+# second half of --jit-wait.
+test-mjit-wait:
+  steps:
+    - install-packages:
+        packages: bison sudo
+    - script:
+        name: workaround ipv6 localhost
+        code: ruby -e "hosts = File.read('/etc/hosts').sub(/^::1\s*localhost.*$/, ''); File.write('/etc/hosts', hosts)"
+    - script:
+        name: create user # some file permission tests don't succeed with root.
+        code: useradd --shell /bin/bash --create-home test && chown -R test:test .
+    - script:
+        name: configure
+        code: /usr/bin/sudo -H -u test -- bash -c 'autoconf && ./configure --disable-install-doc --prefix=/tmp/ruby-prefix'
+    - script:
+        name: make all install
+        code: /usr/bin/sudo -H -u test -- make -j$(nproc) all install
+
+    # -- AUTO GENERATED 2nd half START (by above code) ---
     - script:
         name: make test-all31 -- test/objspace/ (JIT wait)
         code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTS="test/objspace/" TESTOPTS="--color=never --job-status=normal --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit-wait"
@@ -258,12 +295,7 @@ test-mjit-wait:
     - script:
         name: make test-all60 -- others (JIT wait)
         code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTOPTS="--exclude test/-ext-/ --exclude test/base64/ --exclude test/benchmark/ --exclude test/bigdecimal/ --exclude test/cgi/ --exclude test/coverage/ --exclude test/csv/ --exclude test/date/ --exclude test/dbm/ --exclude test/digest/ --exclude test/drb/ --exclude test/dtrace/ --exclude test/erb/ --exclude test/etc/ --exclude test/excludes/ --exclude test/fiddle/ --exclude test/fileutils/ --exclude test/gdbm/ --exclude test/io/ --exclude test/irb/ --exclude test/json/ --exclude test/lib/ --exclude test/logger/ --exclude test/matrix/ --exclude test/minitest/ --exclude test/misc/ --exclude test/mkmf/ --exclude test/monitor/ --exclude test/net/ --exclude test/nkf/ --exclude test/objspace/ --exclude test/open-uri/ --exclude test/openssl/ --exclude test/optparse/ --exclude test/ostruct/ --exclude test/pathname/ --exclude test/psych/ --exclude test/rdoc/ --exclude test/readline/ --exclude test/resolv/ --exclude test/rexml/ --exclude test/rinda/ --exclude test/ripper/ --exclude test/rss/ --exclude test/ruby/ --exclude test/rubygems/ --exclude test/scanf/ --exclude test/sdbm/ --exclude test/shell/ --exclude test/socket/ --exclude test/stringio/ --exclude test/strscan/ --exclude test/syslog/ --exclude test/testunit/ --exclude test/uri/ --exclude test/webrick/ --exclude test/win32ole/ --exclude test/yaml/ --exclude test/zlib/ --color=never --job-status=normal --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit-wait"
-
-    # -- AUTO GENERATED END ---
-
-    - script:
-        name: make test-spec (JIT wait)
-        code: /usr/bin/sudo -H -u test -- make test-spec RUN_OPTS="--disable-gems --jit-wait --jit-warnings"
+    # -- AUTO GENERATED 2nd half END ---
   after-steps:
     - wantedly/pretty-slack-notify:
       webhook_url: $SLACK_WEBHOOK_URL