adding vars for region and az, updating disa ec2 workflow

Signed-off-by: wdower <will@dower.dev>

.github/workflows/lint-profile.yml

@@ -1,11 +1,10 @@
 name: Lint & Check the Profile
 
 on:
-  workflow_dispatch:
-  # push:
-  #   branches-ignore:
-  #     - none
-  # pull_request:
+  push:
+    branches-ignore:
+      - none
+  pull_request:
 
 jobs:
   validate:

.github/workflows/verify-container.yml

@@ -1,11 +1,10 @@
 name: UBI8 Testing Matrix
 
 on:
-  workflow_dispatch:
-  # push:
-  #   branches-ignore:
-  #     - none
-  # pull_request:
+  push:
+    branches-ignore:
+      - none
+  pull_request:
 
 jobs:
   validate:

.github/workflows/verify-disa-hardened-ec2.yml

@@ -1,11 +1,10 @@
 name: DISA Hardened EC2 Testing Matrix
 
 on:
-  workflow_dispatch:
-  # push:
-  #   branches-ignore:
-  #     - none
-  # pull_request:
+  push:
+    branches-ignore:
+      - none
+  pull_request:
 
 jobs:
   validate:

.github/workflows/verify-ec2.yml

@@ -1,11 +1,10 @@
 name: EC2 Testing Matrix
 
 on:
-  workflow_dispatch:
-  # push:
-  #   branches-ignore:
-  #     - none
-  # pull_request:
+  push:
+    branches-ignore:
+      - none
+  pull_request:
 
 jobs:
   validate:

kitchen.disa.ec2.yml

@@ -4,9 +4,10 @@ platforms:
 
 driver:
   name: ec2
-  # subnet_filter:
-  #   tag: 'Default'
-  #   value: '*public*'
+  subnet_id: <%= ENV['SAF_PIPELINE_SUBNET'] %>
+  security_group_ids: <%= ENV['SAF_PIPELINE_SG'] %>
+  region: <%= ENV['SAF_REGION'] %>
+  availability_zone: <%= ENV['SAF_AZ'] %>
   metadata_options:
     http_tokens: required
     http_put_response_hop_limit: 1

kitchen.ec2.yml

@@ -6,8 +6,8 @@ driver:
   name: ec2
   subnet_id: <%= ENV['SAF_PIPELINE_SUBNET'] %>
   security_group_ids: <%= ENV['SAF_PIPELINE_SG'] %>
-  region: us-east-1
-  availability_zone: a
+  region: <%= ENV['SAF_REGION'] %>
+  availability_zone: <%= ENV['SAF_AZ'] %>
   metadata_options:
     http_tokens: required
     http_put_response_hop_limit: 1