diff --git a/.github/workflows/linux_benchmark_testing.yml b/.github/workflows/linux_benchmark_testing.yml index 4a6a742..5c8da2b 100644 --- a/.github/workflows/linux_benchmark_testing.yml +++ b/.github/workflows/linux_benchmark_testing.yml @@ -68,11 +68,6 @@ jobs: working-directory: .github/workflows run: terraform validate - - name: Validate path contents - if: env.ENABLE_DEBUG == 'true' - working-directory: .github/workflows - run: pwd && ls -laR - - name: Terraform_Apply working-directory: .github/workflows env: @@ -86,14 +81,20 @@ jobs: working-directory: .github/workflows run: cat hosts.yml -# Ensure system is up for connections before continuing +# Centos 7 images take a while to come up insert sleep or playbook fails - # - name: Check system is up and running - # working-directory: .github/workflows - # env: - # PRIVATE_KEY: "${{ secrets.SSH_PRV_KEY }}" - # id: test_os - # run: ansible all -i hosts.yml -m wait_for -a "port=22 delay=10 timeout=600" -u ec2-user -e ansible_ssh_private_key_file='{{ lookup("env", "PRIVATE_KEY") }}' + - 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 # Run the ansible playbook - name: Run_Ansible_Playbook @@ -116,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 "OS.tfvars" -var-file "github_vars.tfvars" --auto-approve -input=false + run: terraform destroy -var-file "OS.tfvars" -var-file "github_vars.tfvars" --auto-approve -input=false \ No newline at end of file diff --git a/.github/workflows/main.tf b/.github/workflows/main.tf index b231d2a..3c3954f 100644 --- a/.github/workflows/main.tf +++ b/.github/workflows/main.tf @@ -79,4 +79,4 @@ resource "local_file" "inventory" { system_is_ec2: true audit_git_version: devel EOF -} +} \ No newline at end of file