mirror of
https://github.com/ansible-lockdown/RHEL9-CIS.git
synced 2025-12-27 23:43:06 +00:00
Revert "Merge 'devel' of kris9854/RHEL9-CIS-fix into devel"
This reverts commitd4471a3016, reversing changes made tod6ca36a91f.
This commit is contained in:
parent
66d8fb8b32
commit
da0734c3a8
65 changed files with 461 additions and 801 deletions
2
.github/workflows/github_vars.tfvars
vendored
2
.github/workflows/github_vars.tfvars
vendored
|
|
@ -8,7 +8,7 @@ environment = "lockdown_github_repo_workflow"
|
|||
|
||||
// Matching pair name found in AWS for keypairs PEM key
|
||||
ami_key_pair_name = "github_actions"
|
||||
private_key = ".ssh/github_actions.pem"
|
||||
private_key = "'.ssh/github_actions.pem'"
|
||||
main_vpc_cidr = "172.22.0.0/24"
|
||||
public_subnets = "172.22.0.128/26"
|
||||
private_subnets = "172.22.0.192/26"
|
||||
|
|
|
|||
15
.github/workflows/linux_benchmark_testing.yml
vendored
15
.github/workflows/linux_benchmark_testing.yml
vendored
|
|
@ -81,9 +81,18 @@ jobs:
|
|||
working-directory: .github/workflows
|
||||
run: cat hosts.yml
|
||||
|
||||
# Aws deployments taking a while to come up insert sleep or playbook fails
|
||||
# Centos 7 images take a while to come up insert sleep or playbook fails
|
||||
|
||||
- name: Sleep for 60 seconds
|
||||
- name: Check if test os is rhel7
|
||||
working-directory: .github/workflows
|
||||
id: test_os
|
||||
run: >-
|
||||
echo "::set-output name=RHEL7::$(
|
||||
grep -c RHEL7 OS.tfvars
|
||||
)"
|
||||
|
||||
- name: if RHEL7 - Sleep for 60 seconds
|
||||
#if: steps.test_os.outputs.RHEL7 >= 1
|
||||
run: sleep 60s
|
||||
shell: bash
|
||||
|
||||
|
|
@ -108,4 +117,4 @@ jobs:
|
|||
env:
|
||||
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
||||
run: terraform destroy -var-file "github_vars.tfvars" -var-file "OS.tfvars" --auto-approve -input=false
|
||||
run: terraform destroy -var-file "github_vars.tfvars" -var-file "OS.tfvars" --auto-approve -input=false
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue