Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Report Errors in the Magician #323

Merged
merged 6 commits into from
Jul 3, 2018
Merged

Report Errors in the Magician #323

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a03b161
Report errors when things don't go according to plan!
nat-henderson Jun 30, 2018
0a87944
Tell you where things broke when they break.
nat-henderson Jun 30, 2018
1cfc75d
Include compensation for merge commit difficulties.
nat-henderson Jun 30, 2018
228886c
Merge branch 'master' into errors
nat-henderson Jul 3, 2018
d30926f
Merge 228886c2a7c6d37cee14cc2acfedad9ffdce7ba6 into cbc5a74a760391335…
nat-henderson Jul 3, 2018
fbe7e98
Update tracked submodules -> HEAD on Tue Jul 3 23:10:45 UTC 2018
modular-magician Jul 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 62 additions & 14 deletions .ci/ci.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ resource_types:
type: docker-image
source:
repository: nmckinley/concourse-github-pr-resource
tag: v0.1.7
tag: v0.1.10

- name: gcs-resource
type: docker-image
Expand Down Expand Up @@ -172,21 +172,26 @@ jobs:
version: every
trigger: true
params:
fetch_merge: true
fetch_merge: true
# consumes: magic-modules (because that's where the code is)
# products: patches
- task: get-merged-patches
file: magic-modules/.ci/magic-modules/get-merged-patches.yml
params:
GH_TOKEN: ((github-account.password))
# consumes: magic-modules (detached HEAD)
# produces: magic-modules-branched (new branch, with submodule)
- task: branch-magic-modules
file: magic-modules/.ci/magic-modules/branch.yml
params:
GH_TOKEN: ((github-account.password))
CREDS: ((repo-key.private_key))
ALL_SUBMODULES: {{' '.join(all_submodules)}}
- aggregate:
- task: get-merged-patches
file: magic-modules/.ci/magic-modules/get-merged-patches.yml
params:
GH_TOKEN: ((github-account.password))
# consumes: magic-modules (detached HEAD)
# produces: magic-modules-branched (new branch, with submodule)
- task: branch-magic-modules
file: magic-modules/.ci/magic-modules/branch.yml
params:
GH_TOKEN: ((github-account.password))
CREDS: ((repo-key.private_key))
ALL_SUBMODULES: {{' '.join(all_submodules)}}
- put: magic-modules-new-prs
params:
status: pending
path: magic-modules
- aggregate:
{% if terraform_enabled %}
- do:
Expand Down Expand Up @@ -253,6 +258,12 @@ jobs:
force: true
{% endfor %}
{% endif %}
on_failure:
put: magic-modules-new-prs
params:
status: failed
context: code-generation
path: magic-modules

# consumes: magic-modules-branched
# produces: magic-modules-submodules
Expand Down Expand Up @@ -286,6 +297,15 @@ jobs:
passed: [mm-generate]
- task: test
file: magic-modules/.ci/unit-tests/task.yml
on_failure:
do:
- get: magic-modules-new-prs
passed: [mm-generate]
- put: magic-modules-new-prs
params:
status: failed
context: terraform-tests
path: magic-modules-new-prs
{% endif %}
{% if ansible_enabled %}
- name: ansible-test
Expand All @@ -298,6 +318,15 @@ jobs:
passed: [mm-generate]
- task: test
file: magic-modules/.ci/unit-tests/ansible.yml
on_failure:
do:
- get: magic-modules-new-prs
passed: [mm-generate]
- put: magic-modules-new-prs
params:
status: failed
context: ansible-tests
path: magic-modules-new-prs
{% endif %}
- name: puppet-test
plan:
Expand All @@ -320,6 +349,15 @@ jobs:
EXCLUDE_PATTERN: {{','.join(puppet_test_excludes[module])}}
{%- endif %}
{% endfor %}
on_failure:
do:
- get: magic-modules-new-prs
passed: [mm-generate]
- put: magic-modules-new-prs
params:
status: failed
context: puppet-tests
path: magic-modules-new-prs

- name: chef-test
plan:
Expand All @@ -342,6 +380,15 @@ jobs:
EXCLUDE_PATTERN: {{','.join(chef_test_excludes[module])}}
{%- endif %}
{% endfor %}
on_failure:
do:
- get: magic-modules-new-prs
passed: [mm-generate]
- put: magic-modules-new-prs
params:
status: failed
context: chef-tests
path: magic-modules-new-prs

- name: create-prs
plan:
Expand Down Expand Up @@ -396,6 +443,7 @@ jobs:
put: magic-modules-new-prs
params:
status: failure
context: pr-creation
path: mm-initial-pr
# This will be a no-op the first time through the pipeline. This pushes the updated
# branch named "codegen-pr-$MM_PR_NUMBER" to the downstream terraform repo. The
Expand Down