Skip to content

Commit

Permalink
ci: move truffleruby jobs to a separate pipeline
Browse files Browse the repository at this point in the history
to reduce visual noise
  • Loading branch information
flavorjones committed Jan 4, 2021
1 parent f6d2742 commit 340686b
Show file tree
Hide file tree
Showing 7 changed files with 223 additions and 124 deletions.
18 changes: 0 additions & 18 deletions concourse/nokogiri-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
46 changes: 0 additions & 46 deletions concourse/nokogiri-pr.yml.generated
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
99 changes: 99 additions & 0 deletions concourse/nokogiri-truffleruby.yml
Original file line number Diff line number Diff line change
@@ -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
123 changes: 123 additions & 0 deletions concourse/nokogiri-truffleruby.yml.generated
Original file line number Diff line number Diff line change
@@ -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))
18 changes: 0 additions & 18 deletions concourse/nokogiri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
42 changes: 0 additions & 42 deletions concourse/nokogiri.yml.generated
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions rakelib/concourse.rake
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 340686b

Please sign in to comment.