Ground up 6

.ci/README.md

@@ -6,8 +6,6 @@ These tools manage the downstream repositories of [magic-modules](https://github
 Currently, they manage:
 
 * terraform
-* puppet
-* chef
 * ansible
 
 # CI For Downstream Developers

.ci/ci.yml.tmpl

@@ -44,11 +44,13 @@ resources:
           authorship_restriction: true
           no_label: automerged
 
-    - name: terraform-intermediate
+{% for v in vars.terraform_v.itervalues() %}
+    - name: {{ v.short_name }}-intermediate
       type: git-branch
       source:
-          uri: git@github.com:((github-account.username))/terraform-provider-google.git
+          uri: git@github.com:((github-account.username))/{{ v.provider_name }}.git
           private_key: ((repo-key.private_key))
+{% endfor %}
 
     - name: ansible-intermediate
       type: git-branch
@@ -62,30 +64,6 @@ resources:
           uri: git@github.com:((github-account.username))/inspec-gcp.git
           private_key: ((repo-key.private_key))
 
-{% for module in vars.puppet_modules %}
-    - name: puppet-{{module}}-intermediate
-      type: git-branch
-      source:
-{% if module == '_bundle' %}
-        uri: git@github.com:((github-account.username))/puppet-google.git
-{% else %}
-        uri: git@github.com:((github-account.username))/puppet-google-{{module}}.git
-{% endif %}
-        private_key: ((repo-key.private_key))
-{% endfor %}
-
-{% for module in vars.chef_modules %}
-    - name: chef-{{module}}-intermediate
-      type: git-branch
-      source:
-{% if module == '_bundle' %}
-        uri: git@github.com:((github-account.username))/chef-google.git
-{% else %}
-        uri: git@github.com:((github-account.username))/chef-google-{{module}}.git
-{% endif %}
-        private_key: ((repo-key.private_key))
-{% endfor %}
-
     - name: mm-approved-prs
       type: github-pull-request
       source:
@@ -136,18 +114,25 @@ jobs:
                 status: pending
                 path: magic-modules
           - aggregate:
+            {% for k, v in vars.terraform_v.iteritems() %}
             - do:
                 # consumes: magic-modules-branched
                 # produces: terraform-generated
-              - task: generate-terraform
+              - task: generate-{{v.short_name}}
                 file: magic-modules-branched/.ci/magic-modules/generate-terraform.yml
-              # Puts 'terraform-generated' into the robot's fork.
-              - put: terraform-intermediate
                 params:
-                    repository: terraform-generated
-                    branch_file: magic-modules-branched/branchname
-                    only_if_diff: true
-                    force: true
+                  VERSION: {{k}}
+                  PROVIDER_NAME: {{v.provider_name}}
+                  SHORT_NAME: {{v.short_name}}
+              # Puts 'terraform-generated' into the robot's fork.
+              - aggregate:
+                - put: {{v.short_name}}-intermediate
+                  params:
+                      repository: terraform-generated/{{k}}
+                      branch_file: magic-modules-branched/branchname
+                      only_if_diff: true
+                      force: true
+            {% endfor %}
             - do:
                 # consumes: magic-modules-branched
                 # produces: ansible-generated
@@ -172,43 +157,6 @@ jobs:
                     branch_file: magic-modules-branched/branchname
                     only_if_diff: true
                     force: true
-          {% if vars.puppet_modules %}
-            - do:
-                # consumes: magic-modules-branched
-                # produces: puppet-generated
-              - task: generate-puppet
-                file: magic-modules-branched/.ci/magic-modules/generate-puppet.yml
-                params:
-                  PRODUCTS: {{','.join(vars.puppet_modules)}}
-              - aggregate:
-                {% for module in vars.puppet_modules %}
-                - put: puppet-{{module}}-intermediate
-                  params:
-                      repository: puppet-generated/{{module}}
-                      branch_file: magic-modules-branched/branchname
-                      only_if_diff: true
-                      force: true
-                {% endfor %}
-          {% endif %}
-
-          {% if vars.chef_modules %}
-            - do:
-                # consumes: magic-modules-branched
-                # produces: chef-generated
-              - task: generate-chef
-                file: magic-modules-branched/.ci/magic-modules/generate-chef.yml
-                params:
-                  PRODUCTS: {{','.join(vars.chef_modules)}}
-              - aggregate:
-                {% for module in vars.chef_modules %}
-                - put: chef-{{module}}-intermediate
-                  params:
-                      repository: chef-generated/{{module}}
-                      branch_file: magic-modules-branched/branchname
-                      only_if_diff: true
-                      force: true
-                {% endfor %}
-          {% endif %}
             on_failure:
               put: magic-modules-new-prs
               params:
@@ -224,8 +172,7 @@ jobs:
                 # This needs to match the username for the 'intermediate' resources.
                 GH_USERNAME: ((github-account.username))
                 CREDS: ((repo-key.private_key))
-                PUPPET_MODULES: {{','.join(vars.puppet_modules)}}
-                CHEF_MODULES: {{','.join(vars.chef_modules)}}
+                TERRAFORM_VERSIONS: "{{','.join(vars.terraform_properties_serialized)}}"
                 TERRAFORM_ENABLED: true
                 ANSIBLE_ENABLED: true
                 INSPEC_ENABLED: true
@@ -243,11 +190,18 @@ jobs:
           version: every
           trigger: true
           params:
-              submodules: [build/terraform]
+              submodules: [{{','.join(vars.terraform_submodules)}}]
           passed: [mm-generate]
-        - task: test
-          file: magic-modules/.ci/unit-tests/task.yml
-          timeout: 30m
+        - aggregate:
+          {% for v in vars.terraform_v.itervalues() %}
+          - task: test-{{v.short_name}}
+            file: magic-modules/.ci/unit-tests/task.yml
+            timeout: 30m
+            params:
+              PROVIDER_NAME: {{v.provider_name}}
+              SHORT_NAME: {{v.short_name}}
+              TEST_DIR: {{v.test_dir}}
+          {% endfor %}
           on_failure:
               do:
               - get: magic-modules-new-prs
@@ -300,70 +254,6 @@ jobs:
                   context: inspec-tests
                   path: magic-modules-new-prs
 
-    - name: puppet-test
-      plan:
-        - get: magic-modules
-          version: every
-          trigger: true
-          params:
-              submodules:
-              {% for module in vars.puppet_submodules %}
-                - {{module}}
-              {% endfor %}
-          passed: [mm-generate]
-        - aggregate:
-          {% for module in vars.puppet_modules %}
-          - task: test-{{module}}
-            file: magic-modules/.ci/unit-tests/puppet.yml
-            timeout: 30m
-            params:
-              PRODUCT: {{module}}
-            {%- if vars.puppet_test_excludes.get(module) %}
-              EXCLUDE_PATTERN: {{','.join(vars.puppet_test_excludes[module])}}
-            {%- endif %}
-          {% endfor %}
-          on_failure:
-              do:
-              - get: magic-modules-new-prs
-                passed: [mm-generate]
-              - put: magic-modules-new-prs
-                params:
-                  status: failure
-                  context: puppet-tests
-                  path: magic-modules-new-prs
-
-    - name: chef-test
-      plan:
-        - get: magic-modules
-          version: every
-          trigger: true
-          params:
-              submodules:
-              {% for module in vars.chef_submodules %}
-                - {{module}}
-              {% endfor %}
-          passed: [mm-generate]
-        - aggregate:
-          {% for module in vars.chef_modules %}
-          - task: test-{{module}}
-            file: magic-modules/.ci/unit-tests/chef.yml
-            timeout: 30m
-            params:
-              PRODUCT: {{module}}
-            {%- if vars.chef_test_excludes.get(module) %}
-              EXCLUDE_PATTERN: {{','.join(vars.chef_test_excludes[module])}}
-            {%- endif %}
-          {% endfor %}
-          on_failure:
-              do:
-              - get: magic-modules-new-prs
-                passed: [mm-generate]
-              - put: magic-modules-new-prs
-                params:
-                  status: failure
-                  context: chef-tests
-                  path: magic-modules-new-prs
-
     - name: create-prs
       plan:
           - get: magic-modules
@@ -373,12 +263,6 @@ jobs:
                 submodules: {{vars.all_submodules_yaml_format}}
             passed:
               - mm-generate
-              {%- if vars.chef_modules %}
-              - chef-test
-              {%- endif -%}
-              {%- if vars.puppet_modules %}
-              - puppet-test
-              {%- endif %}
               - terraform-test
               - ansible-test
               - inspec-test
@@ -399,14 +283,7 @@ jobs:
                 TERRAFORM_REPO_USER: terraform-providers
                 ANSIBLE_REPO_USER: modular-magician
                 INSPEC_REPO_USER: modular-magician
-                {%- if vars.puppet_modules %}
-                PUPPET_REPO_USER: GoogleCloudPlatform
-                PUPPET_MODULES: {{','.join(vars.puppet_modules)}}
-                {%- endif %}
-                {%- if vars.chef_modules %}
-                CHEF_REPO_USER: GoogleCloudPlatform
-                CHEF_MODULES: {{','.join(vars.chef_modules)}}
-                {%- endif %}
+                TERRAFORM_VERSIONS: "{{','.join(vars.terraform_properties_serialized)}}"
             on_failure:
               put: magic-modules-new-prs
               params:
@@ -420,9 +297,10 @@ jobs:
           # the pipeline (when a PR needs to be updated), this does that updating by pushing
           # the new code to the repository/branch from which a pull request is already open.
           - aggregate:
-            - put: terraform-intermediate
+            {% for v in vars.terraform_v.itervalues() %}
+            - put: {{v.short_name}}-intermediate
               params:
-                repository: magic-modules-with-comment/build/terraform
+                repository: magic-modules-with-comment/build/{{ v.short_name }}
                 branch_file: magic-modules-with-comment/original_pr_branch_name
                 # Every time a change runs through this pipeline, it will generate a commit with
                 # a different hash - the hash includes timestamps.  Therefore, even if there's no
@@ -432,6 +310,7 @@ jobs:
                 # not push the update even though the commit hashes are different.
                 only_if_diff: true
                 force: true
+            {% endfor %}
             - put: ansible-intermediate
               params:
                 repository: magic-modules-with-comment/build/ansible
@@ -446,23 +325,6 @@ jobs:
                 # See comment on terraform-intermediate
                 only_if_diff: true
                 force: true
-          {% for module in vars.puppet_modules %}
-            - put: puppet-{{module}}-intermediate
-              params:
-                repository: magic-modules-with-comment/build/puppet/{{module}}
-                branch_file: magic-modules-with-comment/original_pr_branch_name
-                only_if_diff: true
-                force: true
-          {% endfor %}
-
-          {% for module in vars.chef_modules %}
-            - put: chef-{{module}}-intermediate
-              params:
-                repository: magic-modules-with-comment/build/chef/{{module}}
-                branch_file: magic-modules-with-comment/original_pr_branch_name
-                only_if_diff: true
-                force: true
-          {% endfor %}
 
           # This isn't load-bearing - it's just aesthetic.  It will also be a no-op the first
           # time through, it works the same way as the preceding push.