Merge branch 'flavorjones-concourse-use-ruby-in-bosh-release'

concourse/nokogiri.yml

@@ -18,8 +18,7 @@ groups:
       - "rbx-<%= rbx_version %>-system"
       - "rbx-<%= rbx_version %>-vendored"
       <% end %>
-      - windows-install-ruby-2.3
-      - ruby-2.3-devkit
+      - win-ruby-2.3-devkit
 
   - name: PRs
     jobs:
@@ -31,26 +30,6 @@ groups:
       - rbx-<%= RUBIES[:rbx].last %>-pr
       - pr-success
 
-  - name: v1.7.x
-    jobs:
-      <% for ruby_version in RUBIES[:mri] %>
-      - v1.7.x-ruby-<%= ruby_version %>
-      <% end %>
-      <% ruby_version = RUBIES[:mri].last %>
-      - v1.7.x-ruby-<%= ruby_version %>-valgrind
-      - v1.7.x-ruby-<%= ruby_version %>-system
-      <% for jruby_version in RUBIES[:jruby] %>
-      - "v1.7.x-jruby-<%= jruby_version %>"
-      <% end %>
-      <% for rbx_version in RUBIES[:rbx] %>
-      - "v1.7.x-rbx-<%= rbx_version %>"
-      <% end %>
-      - v1.7.x-ruby-2.3-devkit
-
-  - name: janitor
-    jobs:
-      - windex
-
 resource_types:
 - name: pull-request
   type: docker-image
@@ -283,29 +262,12 @@ jobs:
             path: ci/concourse/tasks/rake-test/run.sh
   <% end %>
 
-  - name: windows-install-ruby-2.3
-    public: true
-    serial_groups: [windows-configuration]
-    plan:
-      - get: ci
-      - get: nokogiri
-        trigger: true
-      - task: setup
-        config:
-          platform: windows
-          inputs:
-            - name: ci
-          run:
-            path: powershell
-            args: ["-File", "ci/concourse/tasks/windows-config/install-ruby-and-devkit.ps1"]
-
-  - name: ruby-2.3-devkit
+  - name: win-ruby-2.3-devkit
     public: true
     plan:
       - get: ci
       - get: nokogiri
         trigger: true
-        passed: ["windows-install-ruby-2.3"]
       - task: rake-test
         config:
           platform: windows
@@ -316,25 +278,6 @@ jobs:
             path: powershell
             args: ["-File", "ci/concourse/tasks/rake-test/run.ps1"]
 
-  #
-  #  utility
-  #
-  - name: windex
-    public: true
-    serial_groups: [windows-configuration]
-    plan:
-      - get: ci
-      - task: clean
-        config:
-          platform: windows
-          inputs:
-            - name: ci
-          params:
-            CLEAN_WINDOWS: t
-          run:
-            path: powershell
-            args: ["-File", "ci/concourse/tasks/windows-config/install-ruby-and-devkit.ps1"]
-
   #
   #  PRs
   #
@@ -615,7 +558,7 @@ jobs:
             path: ci/concourse/tasks/rake-test/run.sh
   <% end %>
 
-  - name: v1.7.x-ruby-2.3-devkit
+  - name: v1.7.x-win-ruby-2.3-devkit
     public: true
     plan:
       - get: ci

concourse/tasks/rake-test/run.ps1

@@ -1,13 +1,11 @@
-. "ci\concourse\shared\common.ps1"
 . "c:\var\vcap\packages\windows-ruby-dev-tools\prelude.ps1"
 
-prepend-path $ruby23_bin_path
 $env:RUBYOPT = "-rdevkit"
 
 push-location nokogiri
 
-    stream-cmd "gem" "install bundler"
-    stream-cmd "bundle" "install"
-    stream-cmd "bundle" "exec rake test"
+    system-cmd "gem install bundler"
+    system-cmd "bundle install"
+    system-cmd "bundle exec rake test"
 
 pop-location