-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
10 changed files
with
155 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,6 +56,12 @@ resources: | |
uri: [email protected]:((github-account.username))/ansible.git | ||
private_key: ((repo-key.private_key)) | ||
|
||
- name: inspec-intermediate | ||
type: git-branch | ||
source: | ||
uri: [email protected]:((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 | ||
|
@@ -154,6 +160,18 @@ jobs: | |
branch_file: magic-modules-branched/branchname | ||
only_if_diff: true | ||
force: true | ||
- do: | ||
# consumes: magic-modules-branched | ||
# produces: inspec-generated | ||
- task: generate-inspec | ||
file: magic-modules-branched/.ci/magic-modules/generate-inspec.yml | ||
# Puts 'inspec-generated' into the robot's fork. | ||
- put: inspec-intermediate | ||
params: | ||
repository: inspec-generated | ||
branch_file: magic-modules-branched/branchname | ||
only_if_diff: true | ||
force: true | ||
{% if vars.puppet_modules %} | ||
- do: | ||
# consumes: magic-modules-branched | ||
|
@@ -210,6 +228,7 @@ jobs: | |
CHEF_MODULES: {{','.join(vars.chef_modules)}} | ||
TERRAFORM_ENABLED: true | ||
ANSIBLE_ENABLED: true | ||
INSPEC_ENABLED: true | ||
|
||
# Push the magic modules branch that contains the updated submodules. | ||
- put: magic-modules | ||
|
@@ -260,6 +279,27 @@ jobs: | |
context: ansible-tests | ||
path: magic-modules-new-prs | ||
|
||
- name: inspec-test | ||
plan: | ||
- get: magic-modules | ||
version: every | ||
trigger: true | ||
params: | ||
submodules: [build/inspec] | ||
passed: [mm-generate] | ||
- task: test | ||
file: magic-modules/.ci/unit-tests/inspec.yml | ||
timeout: 30m | ||
on_failure: | ||
do: | ||
- get: magic-modules-new-prs | ||
passed: [mm-generate] | ||
- put: magic-modules-new-prs | ||
params: | ||
status: failure | ||
context: inspec-tests | ||
path: magic-modules-new-prs | ||
|
||
- name: puppet-test | ||
plan: | ||
- get: magic-modules | ||
|
@@ -341,6 +381,7 @@ jobs: | |
{%- endif %} | ||
- terraform-test | ||
- ansible-test | ||
- inspec-test | ||
- get: mm-initial-pr | ||
resource: magic-modules-new-prs | ||
passed: [mm-generate] | ||
|
@@ -357,6 +398,7 @@ jobs: | |
# is what you change if you want to test this in a non-live environment. | ||
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)}} | ||
|
@@ -397,6 +439,13 @@ jobs: | |
# See comment on terraform-intermediate | ||
only_if_diff: true | ||
force: true | ||
- put: inspec-intermediate | ||
params: | ||
repository: magic-modules-with-comment/build/inspec | ||
branch_file: magic-modules-with-comment/original_pr_branch_name | ||
# See comment on terraform-intermediate | ||
only_if_diff: true | ||
force: true | ||
{% for module in vars.puppet_modules %} | ||
- put: puppet-{{module}}-intermediate | ||
params: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
#!/bin/bash | ||
|
||
# This script takes in 'magic-modules-branched', a git repo tracking the head of a PR against magic-modules. | ||
# It outputs "inspec-generated", a non-submodule git repo containing the generated inspec code. | ||
|
||
set -x | ||
set -e | ||
source "$(dirname "$0")/helpers.sh" | ||
PATCH_DIR="$(pwd)/patches" | ||
pushd magic-modules-branched | ||
LAST_COMMIT_AUTHOR="$(git log --pretty="%an <%ae>" -n1 HEAD)" | ||
bundle install | ||
for i in $(find products/ -name 'inspec.yaml' -printf '%h\n'); | ||
do | ||
bundle exec compiler -p $i -e inspec -o "build/inspec/" | ||
done | ||
|
||
# This command can crash - if that happens, the script should not fail. | ||
set +e | ||
INSPEC_COMMIT_MSG="$(python .ci/magic-modules/extract_from_pr_description.py --tag inspec < .git/body)" | ||
set -e | ||
if [ -z "$INSPEC_COMMIT_MSG" ]; then | ||
INSPEC_COMMIT_MSG="Magic Modules changes." | ||
fi | ||
|
||
pushd "build/inspec" | ||
# These config entries will set the "committer". | ||
git config --global user.email "[email protected]" | ||
git config --global user.name "Modular Magician" | ||
|
||
git add -A | ||
# Set the "author" to the commit's real author. | ||
git commit -m "$INSPEC_COMMIT_MSG" --author="$LAST_COMMIT_AUTHOR" || true # don't crash if no changes | ||
git checkout -B "$(cat ../../branchname)" | ||
|
||
apply_patches "$PATCH_DIR/modular-magician/inspec" "$INSPEC_COMMIT_MSG" "$LAST_COMMIT_AUTHOR" "devel" | ||
This comment has been minimized.
Sorry, something went wrong. |
||
popd | ||
popd | ||
|
||
git clone magic-modules-branched/build/inspec ./inspec-generated |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
--- | ||
# This file takes two inputs: magic-modules-branched in detached-HEAD state, and the patches. | ||
# It spits out "inspec-generated", an inspec repo on a new branch (named after the | ||
# HEAD commit on the PR), with the new generated code in it. | ||
platform: linux | ||
|
||
image_resource: | ||
type: docker-image | ||
source: | ||
repository: nmckinley/go-ruby-python | ||
tag: '1.11-2.5-2.7' | ||
|
||
inputs: | ||
- name: magic-modules-branched | ||
- name: patches | ||
|
||
outputs: | ||
- name: inspec-generated | ||
|
||
run: | ||
path: magic-modules-branched/.ci/magic-modules/generate-inspec.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -59,6 +59,14 @@ if [ "$ANSIBLE_ENABLED" = "true" ]; then | |
git add build/ansible | ||
fi | ||
|
||
if [ "$INSPEC_ENABLED" = "true" ]; then | ||
git config -f .gitmodules submodule.build/inspec.branch "$BRANCH" | ||
git config -f .gitmodules submodule.build/inspec.url "[email protected]:$GH_USERNAME/inspec-gcp.git" | ||
git submodule sync build/inspec | ||
ssh-agent bash -c "ssh-add ~/github_private_key; git submodule update --remote --init build/inspec" | ||
git add build/inspec | ||
fi | ||
|
||
# Commit those changes so that they can be tested in the next phase. | ||
git add .gitmodules | ||
git config --global user.email "[email protected]" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
echo 'Testing!' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
platform: linux | ||
inputs: | ||
- name: magic-modules | ||
image_resource: | ||
type: docker-image | ||
source: | ||
repository: ruby | ||
tag: '2.5' | ||
run: | ||
path: magic-modules/.ci/unit-tests/inspec.sh | ||
params: | ||
PRODUCT: "" | ||
PROVIDER: chef | ||
EXCLUDE_PATTERN: "" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Wrong branch name - it should be master, not devel.
(Devel is what Ansible calls their master branch)