From 340686b0990e42ccd9d06c0d11198f8df26f69a7 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 3 Jan 2021 21:56:40 -0500 Subject: [PATCH] ci: move truffleruby jobs to a separate pipeline to reduce visual noise --- concourse/nokogiri-pr.yml | 18 --- concourse/nokogiri-pr.yml.generated | 46 ------- concourse/nokogiri-truffleruby.yml | 99 +++++++++++++++ concourse/nokogiri-truffleruby.yml.generated | 123 +++++++++++++++++++ concourse/nokogiri.yml | 18 --- concourse/nokogiri.yml.generated | 42 ------- rakelib/concourse.rake | 1 + 7 files changed, 223 insertions(+), 124 deletions(-) create mode 100644 concourse/nokogiri-truffleruby.yml create mode 100644 concourse/nokogiri-truffleruby.yml.generated diff --git a/concourse/nokogiri-pr.yml b/concourse/nokogiri-pr.yml index 236ca15f75..3ef544f197 100644 --- a/concourse/nokogiri-pr.yml +++ b/concourse/nokogiri-pr.yml @@ -221,24 +221,6 @@ jobs: path: ci/concourse/tasks/rake-test/run.sh #@ end -#@ for ruby_version in all_truffleruby_versions: -#@ job_name = "truffle-{}".format(ruby_version) - - name: #@ job_name - public: true - plan: - - get: ci - - get: nokogiri-pr - trigger: true - version: every - passed: ["cruby-on-vanilla-ubuntu"] - - task: rake-test - config: - "_": #@ template.replace(registry_image("flavorjones/nokogiri-test", "truffle-{}".format(ruby_version))) - inputs: #@ task_inputs() - run: - path: ci/concourse/tasks/rake-test/run.sh -#@ end - #@ job_name = "cruby-on-musl" - name: #@ job_name public: true diff --git a/concourse/nokogiri-pr.yml.generated b/concourse/nokogiri-pr.yml.generated index 668e24c07c..ccf8750817 100644 --- a/concourse/nokogiri-pr.yml.generated +++ b/concourse/nokogiri-pr.yml.generated @@ -578,52 +578,6 @@ jobs: path: ci/concourse/tasks/rake-test/run.sh task: rake-test public: true -- name: truffle-stable - plan: - - get: ci - - get: nokogiri-pr - passed: - - cruby-on-vanilla-ubuntu - trigger: true - version: every - - config: - image_resource: - source: - repository: flavorjones/nokogiri-test - tag: truffle-stable - type: registry-image - inputs: - - name: ci - - name: nokogiri-pr - path: nokogiri - platform: linux - run: - path: ci/concourse/tasks/rake-test/run.sh - task: rake-test - public: true -- name: truffle-nightly - plan: - - get: ci - - get: nokogiri-pr - passed: - - cruby-on-vanilla-ubuntu - trigger: true - version: every - - config: - image_resource: - source: - repository: flavorjones/nokogiri-test - tag: truffle-nightly - type: registry-image - inputs: - - name: ci - - name: nokogiri-pr - path: nokogiri - platform: linux - run: - path: ci/concourse/tasks/rake-test/run.sh - task: rake-test - public: true - name: cruby-on-musl on_abort: params: diff --git a/concourse/nokogiri-truffleruby.yml b/concourse/nokogiri-truffleruby.yml new file mode 100644 index 0000000000..1862275052 --- /dev/null +++ b/concourse/nokogiri-truffleruby.yml @@ -0,0 +1,99 @@ +#@ load("@ytt:template", "template") + +#@ load("ruby.star", "truffleruby_versions") +#@ all_truffleruby_versions = [] +#@ all_truffleruby_versions.extend(truffleruby_versions["supported"]) +#@ all_truffleruby_versions.extend(truffleruby_versions["beta"]) + +--- +#@ def registry_image(image_repo, image_tag): +platform: linux +image_resource: + type: registry-image + source: + repository: #@ image_repo + tag: #@ image_tag +#@ end + +--- +resource_types: + - name: pull-request + type: registry-image + source: + repository: teliaoss/github-pr-resource + + +resources: + - name: ci + type: git + icon: cog + source: + uri: https://github.com/sparklemotion/nokogiri/ + branch: master + disable_ci_skip: true #! always get the latest pipeline configuration + - name: nokogiri + type: git + icon: "github" + check_every: 5m + webhook_token: ((nokogiri-master-webhook-token)) + source: + uri: https://github.com/sparklemotion/nokogiri/ + branch: master + ignore_paths: + - "*.md" + - "concourse/**" + - "suppressions/**" + - ".github/**" + - "Vagrantfile" + - name: nokogiri-pr + type: pull-request + icon: github + check_every: 15m + webhook_token: ((nokogiri-pr-webhook-token)) + source: + repository: sparklemotion/nokogiri + access_token: ((github-repo-status-access-token)) + ignore_drafts: true + ignore_paths: + - "*.md" + - "concourse/" + - "suppressions/" + - ".github/" + - "Vagrantfile" + +jobs: +#@ for ruby_version in all_truffleruby_versions: +#@ job_name = "truffle-{}".format(ruby_version) + - name: #@ job_name + public: true + plan: + - get: ci + - get: nokogiri + trigger: true + - task: rake-test + config: + "_": #@ template.replace(registry_image("flavorjones/nokogiri-test", "truffle-{}".format(ruby_version))) + inputs: + - name: ci + - name: nokogiri + run: { path: ci/concourse/tasks/rake-test/run.sh } +#@ end + +#@ for ruby_version in all_truffleruby_versions: +#@ job_name = "truffle-pr-{}".format(ruby_version) + - name: #@ job_name + public: true + plan: + - get: ci + - get: nokogiri-pr + trigger: true + version: every + - task: rake-test + config: + "_": #@ template.replace(registry_image("flavorjones/nokogiri-test", "truffle-{}".format(ruby_version))) + inputs: + - name: ci + - name: nokogiri-pr + path: nokogiri + run: { path: ci/concourse/tasks/rake-test/run.sh } +#@ end diff --git a/concourse/nokogiri-truffleruby.yml.generated b/concourse/nokogiri-truffleruby.yml.generated new file mode 100644 index 0000000000..d00a4c7f75 --- /dev/null +++ b/concourse/nokogiri-truffleruby.yml.generated @@ -0,0 +1,123 @@ +jobs: +- name: truffle-stable + plan: + - get: ci + - get: nokogiri + trigger: true + - config: + image_resource: + source: + repository: flavorjones/nokogiri-test + tag: truffle-stable + type: registry-image + inputs: + - name: ci + - name: nokogiri + platform: linux + run: + path: ci/concourse/tasks/rake-test/run.sh + task: rake-test + public: true +- name: truffle-nightly + plan: + - get: ci + - get: nokogiri + trigger: true + - config: + image_resource: + source: + repository: flavorjones/nokogiri-test + tag: truffle-nightly + type: registry-image + inputs: + - name: ci + - name: nokogiri + platform: linux + run: + path: ci/concourse/tasks/rake-test/run.sh + task: rake-test + public: true +- name: truffle-pr-stable + plan: + - get: ci + - get: nokogiri-pr + trigger: true + version: every + - config: + image_resource: + source: + repository: flavorjones/nokogiri-test + tag: truffle-stable + type: registry-image + inputs: + - name: ci + - name: nokogiri-pr + path: nokogiri + platform: linux + run: + path: ci/concourse/tasks/rake-test/run.sh + task: rake-test + public: true +- name: truffle-pr-nightly + plan: + - get: ci + - get: nokogiri-pr + trigger: true + version: every + - config: + image_resource: + source: + repository: flavorjones/nokogiri-test + tag: truffle-nightly + type: registry-image + inputs: + - name: ci + - name: nokogiri-pr + path: nokogiri + platform: linux + run: + path: ci/concourse/tasks/rake-test/run.sh + task: rake-test + public: true +resource_types: +- name: pull-request + source: + repository: teliaoss/github-pr-resource + type: registry-image +resources: +- icon: cog + name: ci + source: + branch: master + disable_ci_skip: true + uri: https://github.com/sparklemotion/nokogiri/ + type: git +- check_every: 5m + icon: github + name: nokogiri + source: + branch: master + ignore_paths: + - '*.md' + - concourse/** + - suppressions/** + - .github/** + - Vagrantfile + uri: https://github.com/sparklemotion/nokogiri/ + type: git + webhook_token: ((nokogiri-master-webhook-token)) +- check_every: 15m + icon: github + name: nokogiri-pr + source: + access_token: ((github-repo-status-access-token)) + ignore_drafts: true + ignore_paths: + - '*.md' + - concourse/ + - suppressions/ + - .github/ + - Vagrantfile + repository: sparklemotion/nokogiri + type: pull-request + webhook_token: ((nokogiri-pr-webhook-token)) diff --git a/concourse/nokogiri.yml b/concourse/nokogiri.yml index a52dd917cb..3abcb78e21 100644 --- a/concourse/nokogiri.yml +++ b/concourse/nokogiri.yml @@ -186,24 +186,6 @@ jobs: #@ end -#@ for ruby_version in all_truffleruby_versions: -#@ job_name = "truffle-{}".format(ruby_version) - - name: #@ job_name - public: true -#! _: #@ template.replace(notify_on_failure(job_name)) - plan: - - get: ci - - get: nokogiri - trigger: true - passed: ["cruby-on-vanilla-ubuntu"] - - task: rake-test - config: - "_": #@ template.replace(registry_image("flavorjones/nokogiri-test", "truffle-{}".format(ruby_version))) - inputs: #@ task_inputs() - run: {path: ci/concourse/tasks/rake-test/run.sh} -#@ end - - #@ job_name = "cruby-on-musl" - name: #@ job_name public: true diff --git a/concourse/nokogiri.yml.generated b/concourse/nokogiri.yml.generated index 7f7faaf3f2..a373b1a21f 100644 --- a/concourse/nokogiri.yml.generated +++ b/concourse/nokogiri.yml.generated @@ -346,48 +346,6 @@ jobs: path: ci/concourse/tasks/rake-test/run.sh task: rake-test public: true -- name: truffle-stable - plan: - - get: ci - - get: nokogiri - passed: - - cruby-on-vanilla-ubuntu - trigger: true - - config: - image_resource: - source: - repository: flavorjones/nokogiri-test - tag: truffle-stable - type: registry-image - inputs: - - name: ci - - name: nokogiri - platform: linux - run: - path: ci/concourse/tasks/rake-test/run.sh - task: rake-test - public: true -- name: truffle-nightly - plan: - - get: ci - - get: nokogiri - passed: - - cruby-on-vanilla-ubuntu - trigger: true - - config: - image_resource: - source: - repository: flavorjones/nokogiri-test - tag: truffle-nightly - type: registry-image - inputs: - - name: ci - - name: nokogiri - platform: linux - run: - path: ci/concourse/tasks/rake-test/run.sh - task: rake-test - public: true - name: cruby-on-musl on_failure: in_parallel: diff --git a/rakelib/concourse.rake b/rakelib/concourse.rake index fc4ffd9dba..ae2ec124f2 100644 --- a/rakelib/concourse.rake +++ b/rakelib/concourse.rake @@ -3,4 +3,5 @@ require "concourse" Concourse.new("nokogiri", fly_target: "ci", format: true) do |c| c.add_pipeline "nokogiri", "nokogiri.yml", ytt: true c.add_pipeline "nokogiri-pr", "nokogiri-pr.yml", ytt: true + c.add_pipeline "nokogiri-truffleruby", "nokogiri-truffleruby.yml", ytt: true end