From c03d1094941c176bc3c4fc7fe3905adf87b4021f Mon Sep 17 00:00:00 2001
From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com>
Date: Tue, 4 Feb 2020 15:20:58 -0600
Subject: [PATCH] fixed them cases

---
 .automation/test/ansible/ansible_bad_1.yml    | 42 +++++++++++++++++++
 ...github-playbook.yml => ansible_good_1.yml} |  0
 .github/workflows/deploy-DEV.yml              |  7 ++--
 lib/linter.sh                                 | 27 ++++++++++++
 4 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 .automation/test/ansible/ansible_bad_1.yml
 rename .automation/test/ansible/{github-playbook.yml => ansible_good_1.yml} (100%)

diff --git a/.automation/test/ansible/ansible_bad_1.yml b/.automation/test/ansible/ansible_bad_1.yml
new file mode 100644
index 00000000..9bae03fb
--- /dev/null
+++ b/.automation/test/ansible/ansible_bad_1.yml
@@ -0,0 +1,42 @@
+---
+###########################################
+###########################################
+#### GitHub Services-Engineering Stack ####
+####                                   ####
+#### GHE Primary HA backup-utils ONLY  ####
+###########################################
+###########################################
+
+###############################
+# Description of the playbook #
+###############################
+# description: Builds GHE Primary, HA, and backup-utils.
+# detailed_description: Builds GHE Primary, HA, and backup-utils.
+
+######################
+## Configure GitHub ##
+######################
+- hosts: github_primary
+  vars:
+    demo_github_initial_user: "{{ hostvars['localhost'].local_user }}"
+    github_host: "{{ hostvars['github_primary'].ansible_host }}"
+    probot_server_ip: "{{ hostvars['backup-utils'].ansible_host }}"
+  roles:
+    - role: ghe-demo
+
+##########################################
+## Run ghe-config-apply for all changes ##
+##########################################
+# Due to us hot loading some data into GHE, the final
+# run of ghe-config-apply hangs and leaves the system in an odd state
+# The simplist option is to run the process
+# 1 more time at the end to solve the issue
+- hosts: github_primary
+  tasks:
+    - block:
+        - name: GHE-Config-Apply
+          include_role:
+            name: ghe-demo
+            tasks_from: ghe-config-apply.yml
+      tags:
+        - github
diff --git a/.automation/test/ansible/github-playbook.yml b/.automation/test/ansible/ansible_good_1.yml
similarity index 100%
rename from .automation/test/ansible/github-playbook.yml
rename to .automation/test/ansible/ansible_good_1.yml
diff --git a/.github/workflows/deploy-DEV.yml b/.github/workflows/deploy-DEV.yml
index 21a388ac..54816cf7 100644
--- a/.github/workflows/deploy-DEV.yml
+++ b/.github/workflows/deploy-DEV.yml
@@ -53,10 +53,9 @@ jobs:
         shell: bash
         run: .automation/upload-docker.sh
 
-      - name: debug
-        run: printenv
-        shell: bash
-
+      #######################
+      # Get the branch name #
+      #######################
       - name: Extract branch name
         shell: bash
         run: echo "::set-env name=BRANCH_NAME::$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')"
diff --git a/lib/linter.sh b/lib/linter.sh
index af14800a..5c50dce6 100755
--- a/lib/linter.sh
+++ b/lib/linter.sh
@@ -1317,6 +1317,16 @@ TestCodebase()
     # Example: markdown_good_1.md -> good
     FILE_STATUS=$(echo "$FILE_NAME" |cut -f2 -d'_')
 
+    #########################################################
+    # If not found, assume it should be linted successfully #
+    #########################################################
+    if [ -z "$FILE_STATUS" ]; then
+      ##################################
+      # Set to good for proper linting #
+      ##################################
+      FILE_STATUS="good"
+    fi
+
     ##############
     # File print #
     ##############
@@ -1328,6 +1338,23 @@ TestCodebase()
     ########################
     LINT_CMD=''
 
+    #######################################
+    # Check if docker and get folder name #
+    #######################################
+    if [[ "$FILE_TYPE" == "DOCKER" ]]; then
+      if [[ "$FILE" == *"good"* ]]; then
+        #############
+        # Good file #
+        #############
+        FILE_STATUS='good'
+      else
+        ############
+        # Bad file #
+        ############
+        FILE_STATUS='bad'
+      fi
+    fi
+
     #####################
     # Check for ansible #
     #####################