-
Notifications
You must be signed in to change notification settings - Fork 125
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.
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
Exclude Filestore module from integration test #2725
Open
mr0re1
wants to merge
1
commit into
GoogleCloudPlatform:develop
Choose a base branch
from
mr0re1:tst_remove_mod
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
26 changes: 26 additions & 0 deletions
26
tools/cloud-build/daily-tests/ansible_playbooks/pre-create-tasks/remove-modules.yml
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,26 @@ | ||
# Copyright 2024 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
--- | ||
- name: Assert variables are defined | ||
ansible.builtin.assert: | ||
that: | ||
- workspace is defined | ||
- blueprint_yaml is defined | ||
- custom_vars.modules_to_remove is defined | ||
|
||
- name: Remove modules | ||
ansible.builtin.command: "{{ workspace }}/tools/cloud-build/daily-tests/remove_module.py --blueprint {{ blueprint_yaml }} --module {{ module_to_remove }}" | ||
loop: "{{ custom_vars.modules_to_remove }}" | ||
loop_control: | ||
loop_var: module_to_remove |
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,52 @@ | ||
#!/usr/bin/env python3 | ||
# Copyright 2024 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
import yaml # pip install pyyaml | ||
|
||
def delete_module(bp, mod_id: str): | ||
for g in bp["deployment_groups"]: | ||
for im, m in enumerate(g["modules"]): | ||
if m["id"] == mod_id: | ||
del g["modules"][im] | ||
return | ||
raise RuntimeError(f"Module {mod_id} not found") | ||
|
||
def update_bp(bp, mod_id: str): | ||
delete_module(bp, mod_id) | ||
# remove module from "use" | ||
for g in bp["deployment_groups"]: | ||
for m in g["modules"]: | ||
if mod_id in m.get("use", []): | ||
m["use"].remove(mod_id) | ||
# TODO: | ||
# - move all settings of removed module into some "/dev/null" to prevent | ||
# "variable not used" validation errors | ||
# - handle references to removed module (e.g. raise error if referenced) | ||
|
||
def main(): | ||
import argparse | ||
parser = argparse.ArgumentParser() | ||
parser.add_argument("--blueprint", required=True, type=str) | ||
parser.add_argument("--module", required=True, type=str, help="Module ID to remove") | ||
args = parser.parse_args() | ||
|
||
with open(args.blueprint) as yf: | ||
bp = yaml.safe_load(yf) | ||
update_bp(bp, mod_id=args.module) | ||
with open(args.blueprint, "w") as yf: | ||
yaml.dump(bp, yf) | ||
|
||
if __name__ == "__main__": | ||
main() |
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we print to console in this method, will it show up in CloudBuild logs? If so, I think it would be really helpful to see in the logs exactly which modules were removed from the blueprint. It would also be really helpful to see two more artifacts:
Maybe we could save them in GCS and reference them in our CloudBuild yaml like this?
https://cloud.google.com/build/docs/building/store-artifacts-in-cloud-storage
At the very least, for this PR, it would be good to print the blueprint before and after modification to the log.