Skip to content

Commit

Permalink
This solves skipped Magician runs Once And For All.
Browse files Browse the repository at this point in the history
The problem is in concourse/concourse#736.
This is the workaround advised by the concourse folks.  :)
  • Loading branch information
nat-henderson committed Jul 11, 2018
1 parent 97edbf1 commit ecf7dcc
Showing 1 changed file with 43 additions and 0 deletions.
43 changes: 43 additions & 0 deletions .ci/ci.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ resource_types:
repository: frodenas/gcs-resource

resources:
- name: job-ordering
type: time
source: {interval: 72h} # Irrelevant - this is a workaround for concourse GH #736.

- name: magic-modules
type: git-branch
source:
Expand Down Expand Up @@ -284,6 +288,7 @@ jobs:
repository: magic-modules-submodules
branch_file: magic-modules-branched/branchname
force: true
- put: job-ordering

{% if terraform_enabled %}
- name: terraform-test
Expand All @@ -294,6 +299,10 @@ jobs:
params:
submodules: [build/terraform]
passed: [mm-generate]
- get: job-ordering
version: every
trigger: true
passed: [mm-generate]
- task: test
file: magic-modules/.ci/unit-tests/task.yml
timeout: 30m
Expand All @@ -306,6 +315,7 @@ jobs:
status: failure
context: terraform-tests
path: magic-modules-new-prs
- put: job-ordering
{% endif %}
{% if ansible_enabled %}
- name: ansible-test
Expand All @@ -316,6 +326,10 @@ jobs:
params:
submodules: [build/ansible]
passed: [mm-generate]
- get: job-ordering
version: every
trigger: true
passed: [mm-generate]
- task: test
file: magic-modules/.ci/unit-tests/ansible.yml
timeout: 30m
Expand All @@ -328,6 +342,7 @@ jobs:
status: failure
context: ansible-tests
path: magic-modules-new-prs
- put: job-ordering
{% endif %}
- name: puppet-test
plan:
Expand All @@ -340,6 +355,10 @@ jobs:
- {{module}}
{% endfor %}
passed: [mm-generate]
- get: job-ordering
version: every
trigger: true
passed: [mm-generate]
- aggregate:
{% for module in puppet_modules %}
- task: test-{{module}}
Expand All @@ -360,6 +379,7 @@ jobs:
status: failure
context: puppet-tests
path: magic-modules-new-prs
- put: job-ordering

- name: chef-test
plan:
Expand All @@ -372,6 +392,10 @@ jobs:
- {{module}}
{% endfor %}
passed: [mm-generate]
- get: job-ordering
version: every
trigger: true
passed: [mm-generate]
- aggregate:
{% for module in chef_modules %}
- task: test-{{module}}
Expand All @@ -392,6 +416,7 @@ jobs:
status: failure
context: chef-tests
path: magic-modules-new-prs
- put: job-ordering

- name: create-prs
plan:
Expand All @@ -414,6 +439,24 @@ jobs:
{%- if ansible_enabled %}
- ansible-test
{%- endif %}
- get: job-ordering
version: every
trigger: true
passed:
- mm-generate
{%- if chef_modules %}
- chef-test
{%- endif -%}
{%- if puppet_modules %}
- puppet-test
{%- endif -%}
{%- if terraform_enabled %}
- terraform-test
{%- endif %}
{%- if ansible_enabled %}
- ansible-test
{%- endif %}

- get: mm-initial-pr
resource: magic-modules-new-prs
passed: [mm-generate]
Expand Down

0 comments on commit ecf7dcc

Please sign in to comment.