From a03b16162b1c8e4d0ecacb440f1629ab741511ff Mon Sep 17 00:00:00 2001 From: Nathan McKinley Date: Fri, 29 Jun 2018 17:05:50 -0700 Subject: [PATCH 1/4] Report errors when things don't go according to plan! --- .ci/ci.yml.tmpl | 66 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/.ci/ci.yml.tmpl b/.ci/ci.yml.tmpl index ab47aeff294f..abb4ada5de9d 100644 --- a/.ci/ci.yml.tmpl +++ b/.ci/ci.yml.tmpl @@ -175,18 +175,23 @@ jobs: 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: @@ -253,6 +258,11 @@ jobs: force: true {% endfor %} {% endif %} + on_failure: + put: magic-modules-new-prs + params: + status: failed + path: magic-modules # consumes: magic-modules-branched # produces: magic-modules-submodules @@ -286,6 +296,14 @@ 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 + path: magic-modules-new-prs {% endif %} {% if ansible_enabled %} - name: ansible-test @@ -298,6 +316,14 @@ 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 + path: magic-modules-new-prs {% endif %} - name: puppet-test plan: @@ -320,6 +346,14 @@ 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 + path: magic-modules-new-prs - name: chef-test plan: @@ -342,6 +376,14 @@ 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 + path: magic-modules-new-prs - name: create-prs plan: From 0a879446130a9dd20417f86837afe0a1dc07cdee Mon Sep 17 00:00:00 2001 From: Nathan McKinley Date: Fri, 29 Jun 2018 17:59:25 -0700 Subject: [PATCH 2/4] Tell you where things broke when they break. --- .ci/ci.yml.tmpl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.ci/ci.yml.tmpl b/.ci/ci.yml.tmpl index abb4ada5de9d..7d739a9e8d32 100644 --- a/.ci/ci.yml.tmpl +++ b/.ci/ci.yml.tmpl @@ -262,6 +262,7 @@ jobs: put: magic-modules-new-prs params: status: failed + context: code-generation path: magic-modules # consumes: magic-modules-branched @@ -303,6 +304,7 @@ jobs: - put: magic-modules-new-prs params: status: failed + context: terraform-tests path: magic-modules-new-prs {% endif %} {% if ansible_enabled %} @@ -323,6 +325,7 @@ jobs: - put: magic-modules-new-prs params: status: failed + context: ansible-tests path: magic-modules-new-prs {% endif %} - name: puppet-test @@ -353,6 +356,7 @@ jobs: - put: magic-modules-new-prs params: status: failed + context: puppet-tests path: magic-modules-new-prs - name: chef-test @@ -383,6 +387,7 @@ jobs: - put: magic-modules-new-prs params: status: failed + context: chef-tests path: magic-modules-new-prs - name: create-prs @@ -438,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 From 1cfc75df01daebb17cb443e8e6f4ef22bdcd5255 Mon Sep 17 00:00:00 2001 From: Nathan McKinley Date: Fri, 29 Jun 2018 18:29:56 -0700 Subject: [PATCH 3/4] Include compensation for merge commit difficulties. --- .ci/ci.yml.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/ci.yml.tmpl b/.ci/ci.yml.tmpl index 7d739a9e8d32..39c1a97b9e94 100644 --- a/.ci/ci.yml.tmpl +++ b/.ci/ci.yml.tmpl @@ -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 @@ -172,7 +172,7 @@ jobs: version: every trigger: true params: - fetch_merge: true + fetch_merge: true # consumes: magic-modules (because that's where the code is) # products: patches - aggregate: From fbe7e98c793f3db583ef4b55490bbfba56dcbe87 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Tue, 3 Jul 2018 23:10:45 +0000 Subject: [PATCH 4/4] Update tracked submodules -> HEAD on Tue Jul 3 23:10:45 UTC 2018 Tracked submodules are build/puppet/compute build/puppet/sql build/puppet/storage build/chef/compute build/chef/sql build/chef/storage build/terraform build/ansible. --- build/puppet/compute | 2 +- build/puppet/sql | 2 +- build/puppet/storage | 2 +- build/terraform | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/puppet/compute b/build/puppet/compute index 7d650f798a27..9e44b53b0a48 160000 --- a/build/puppet/compute +++ b/build/puppet/compute @@ -1 +1 @@ -Subproject commit 7d650f798a2738e2b7c593438864a352fd9b9a1b +Subproject commit 9e44b53b0a48b04a3be9cee39b217117f309bd14 diff --git a/build/puppet/sql b/build/puppet/sql index ee8c2b12eeb7..af5d7b4261f1 160000 --- a/build/puppet/sql +++ b/build/puppet/sql @@ -1 +1 @@ -Subproject commit ee8c2b12eeb72b2594fc2e0f34fbdfcc1c5f3558 +Subproject commit af5d7b4261f14861d3be16b928af90e26347d71c diff --git a/build/puppet/storage b/build/puppet/storage index 3a31b2a67e71..e1c87a5f625b 160000 --- a/build/puppet/storage +++ b/build/puppet/storage @@ -1 +1 @@ -Subproject commit 3a31b2a67e7189ad1a6cc93e48f2045831235138 +Subproject commit e1c87a5f625bb9754e480d0129118925e32825bf diff --git a/build/terraform b/build/terraform index d786d633af30..064ec03ffa6e 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit d786d633af3072407bd664d5099889dcc312f290 +Subproject commit 064ec03ffa6e1fbb696012740646d27cf8d04214