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

Update main release and alignment #318

Merged
merged 29 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
22e22b5
yaml lint updates
uk-bolly Mar 21, 2023
bc565f4
updated to latest version
uk-bolly Mar 21, 2023
52389e2
updated
uk-bolly Mar 21, 2023
65a36cd
moved 2.2.1.1 to a block
uk-bolly Mar 21, 2023
7ba5c1d
badge update and links
uk-bolly Mar 23, 2023
df72b9d
link update
uk-bolly Mar 23, 2023
11bd4bf
badge updates
uk-bolly Mar 23, 2023
528d2e7
badge updates
uk-bolly Mar 23, 2023
cb3193a
badge updates
uk-bolly Mar 23, 2023
07ea7c4
added badge
uk-bolly Mar 23, 2023
69ae864
added badge
uk-bolly Mar 23, 2023
df926e1
changed layout
uk-bolly Mar 23, 2023
6ab099a
added discord
uk-bolly Mar 23, 2023
00ffd36
layout
uk-bolly Mar 23, 2023
7914bfe
layout
uk-bolly Mar 23, 2023
8c651f6
update
uk-bolly Mar 23, 2023
980143b
Merge pull request #311 from ansible-lockdown/lint_updates
georgenalen Mar 23, 2023
479b556
Yamllint Update, Yamllint Check, Ansible-lint Check, Module Names Update
MrSteve81 Apr 10, 2023
a3be343
Merge pull request #312 from ansible-lockdown/mrsteve_linting_april_2023
MrSteve81 Apr 11, 2023
93ae7ac
Added 1.2.4 and 1.2.5 back in
uk-bolly Apr 26, 2023
cfbf95e
fix typo
uk-bolly Apr 26, 2023
be78773
Merge pull request #314 from ansible-lockdown/issue_313
uk-bolly Apr 27, 2023
aa66978
issue #315 remove arg warn
uk-bolly Sep 12, 2023
b707c5a
lint updates
uk-bolly Sep 12, 2023
37f2427
issue_#316
uk-bolly Sep 12, 2023
0ba231f
updated
uk-bolly Sep 12, 2023
b0d6cc5
workflow updates
uk-bolly Sep 12, 2023
4518fb1
updated
uk-bolly Sep 12, 2023
d2cb6c9
Merge pull request #317 from ansible-lockdown/sept23_updates
uk-bolly Sep 13, 2023
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
2 changes: 2 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---

parseable: true
quiet: true
skip_list:
Expand All @@ -11,6 +12,7 @@ skip_list:
- 'name[casing]'
- 'name[template]'
- 'fqcn[action]'
- 'key-order[task]'
- '204'
- '305'
- '303'
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/OS.tfvars

This file was deleted.

138 changes: 138 additions & 0 deletions .github/workflows/devel_pipeline_validation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
---

name: Devel pipeline

on: # yamllint disable-line rule:truthy
pull_request_target:
types: [opened, reopened, synchronize]
branches:
- devel
paths:
- '**.yml'
- '**.sh'
- '**.j2'
- '**.ps1'
- '**.cfg'

# A workflow run is made up of one or more jobs
# that can run sequentially or in parallel
jobs:
# This will create messages for first time contributers and direct them to the Discord server
welcome:
runs-on: ubuntu-latest

steps:
- uses: actions/first-interaction@main
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
pr-message: |-
Congrats on opening your first pull request and thank you for taking the time to help improve Ansible-Lockdown!
Please join in the conversation happening on the [Discord Server](https://discord.io/ansible-lockdown) as well.

# This workflow contains a single job which tests the playbook
playbook-test:
# The type of runner that the job will run on
runs-on: ubuntu-latest
env:
ENABLE_DEBUG: ${{ vars.ENABLE_DEBUG }}
# Imported as a variable by terraform
TF_VAR_repository: ${{ github.event.repository.name }}
defaults:
run:
shell: bash
working-directory: .github/workflows/github_linux_IaC

steps:
- name: Clone ${{ github.event.repository.name }}
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

# Pull in terraform code for linux servers
- name: Clone github IaC plan
uses: actions/checkout@v3
with:
repository: ansible-lockdown/github_linux_IaC
path: .github/workflows/github_linux_IaC

- name: Add_ssh_key
working-directory: .github/workflows
env:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
PRIVATE_KEY: "${{ secrets.SSH_PRV_KEY }}"
run: |
mkdir .ssh
chmod 700 .ssh
echo $PRIVATE_KEY > .ssh/github_actions.pem
chmod 600 .ssh/github_actions.pem

- name: DEBUG - Show IaC files
if: env.ENABLE_DEBUG == 'true'
run: |
echo "OSVAR = $OSVAR"
echo "benchmark_type = $benchmark_type"
pwd
ls
env:
# Imported from github variables this is used to load the relvent OS.tfvars file
OSVAR: ${{ vars.OSVAR }}
benchmark_type: ${{ vars.BENCHMARK_TYPE }}

- name: Terraform_Init
id: init
run: terraform init
env:
# Imported from github variables this is used to load the relvent OS.tfvars file
OSVAR: ${{ vars.OSVAR }}
TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}

- name: Terraform_Validate
id: validate
run: terraform validate
env:
# Imported from github variables this is used to load the relvent OS.tfvars file
OSVAR: ${{ vars.OSVAR }}
TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}

- name: Terraform_Apply
id: apply
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
OSVAR: ${{ vars.OSVAR }}
TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
run: terraform apply -var-file "github_vars.tfvars" -var-file "${OSVAR}.tfvars" --auto-approve -input=false

## Debug Section
- name: DEBUG - Show Ansible hostfile
if: env.ENABLE_DEBUG == 'true'
run: cat hosts.yml

# Aws deployments taking a while to come up insert sleep or playbook fails

- name: Sleep for 60 seconds
run: sleep 60s

# Run the ansible playbook
- name: Run_Ansible_Playbook
uses: arillso/action.playbook@master
with:
playbook: site.yml
inventory: .github/workflows/github_linux_IaC/hosts.yml
galaxy_file: collections/requirements.yml
private_key: ${{ secrets.SSH_PRV_KEY }}
# verbose: 3
env:
ANSIBLE_HOST_KEY_CHECKING: "false"
ANSIBLE_DEPRECATION_WARNINGS: "false"

# Remove test system - User secrets to keep if necessary

- name: Terraform_Destroy
if: always() && env.ENABLE_DEBUG == 'false'
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
OSVAR: ${{ vars.OSVAR }}
TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
run: terraform destroy -var-file "github_vars.tfvars" -var-file "${OSVAR}.tfvars" --auto-approve -input=false
53 changes: 0 additions & 53 deletions .github/workflows/github_networks.tf

This file was deleted.

14 changes: 0 additions & 14 deletions .github/workflows/github_vars.tfvars

This file was deleted.

111 changes: 0 additions & 111 deletions .github/workflows/linux_benchmark_testing.yml

This file was deleted.

Loading
Loading