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.

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

fix the failures in destroy #260

Merged
merged 8 commits into from
Sep 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 4 additions & 6 deletions .github/workflows/dsf_poc_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,19 +156,17 @@ jobs:
mv $EXAMPLE_DIR/dra.tf{,_}
mv $EXAMPLE_DIR/sonar.tf{,_}
mv $EXAMPLE_DIR/networking.tf{,_}
mv $EXAMPLE_DIR/agentless_sources.tf{,_}
mv $EXAMPLE_DIR/agent_sources.tf{,_}
terraform -chdir=$EXAMPLE_DIR destroy -var license=license.mprv -auto-approve
mv $EXAMPLE_DIR/main.tf{_,}
mv $EXAMPLE_DIR/outputs.tf{_,}
mv $EXAMPLE_DIR/dam.tf{_,}
mv $EXAMPLE_DIR/dra.tf{_,}
mv $EXAMPLE_DIR/sonar.tf{_,}
mv $EXAMPLE_DIR/networking.tf{_,}
fi

- name: Terraform Create Workspace
run: |
if [ ${{ github.event_name }} != 'schedule' ]; then
terraform -chdir=$EXAMPLE_DIR workspace new $TMP_WORKSPACE_NAME
mv $EXAMPLE_DIR/agentless_sources.tf{_,}
mv $EXAMPLE_DIR/agent_sources.tf{_,}
fi

- name: Terraform Validate
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/sonar_single_account_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,9 @@ jobs:
key: ${{ env.JUMP_SERVER_KEY }}
port: 22
command_timeout: "2h"
envs: TARGET_DIR
envs: REMOTE_EXAMPLE_DIR
script: |
cd $TARGET_DIR
rm -rf dsfkit
rm -rf dsfkit.zip
terraform -chdir=$REMOTE_EXAMPLE_DIR destroy -auto-approve

- name: Delete Old Environment
uses: appleboy/[email protected]
Expand All @@ -107,7 +105,7 @@ jobs:
command_timeout: "2h"
envs: TARGET_DIR
script: |
terraform -chdir=$REMOTE_EXAMPLE_DIR destroy -auto-approve
cd $TARGET_DIR
rm -rf dsfkit
rm -rf dsfkit.zip

Expand Down