From a0ef46ccf4124b3013d1ba8bc48209ae991a5977 Mon Sep 17 00:00:00 2001
From: Miah Johnson <miah@chia-pet.org>
Date: Fri, 18 Oct 2019 12:11:02 -0700
Subject: [PATCH] Stop using reserved pipelines with default triggers.

The pipeline prefixes: deploy, habitat, omnibus, and verify all have default
triggers associtated with them.

https://expeditor.chef.io/docs/reference/configuration/#pipelines

Signed-off-by: Miah Johnson <miah@chia-pet.org>
---
 .expeditor/{habitat_test.yml => artifact.habitat.yml}  |  4 ++--
 .../{habitat_test.ps1 => artifact.habitat.test.ps1}    |  0
 .../{habitat_test.sh => artifact.habitat.test.sh}      |  0
 .expeditor/config.yml                                  | 10 +++++-----
 ...{verify.resources.yml => integration.resources.yml} |  0
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename .expeditor/{habitat_test.yml => artifact.habitat.yml} (73%)
 rename .expeditor/buildkite/{habitat_test.ps1 => artifact.habitat.test.ps1} (100%)
 rename .expeditor/buildkite/{habitat_test.sh => artifact.habitat.test.sh} (100%)
 rename .expeditor/{verify.resources.yml => integration.resources.yml} (100%)

diff --git a/.expeditor/habitat_test.yml b/.expeditor/artifact.habitat.yml
similarity index 73%
rename from .expeditor/habitat_test.yml
rename to .expeditor/artifact.habitat.yml
index 45be69972..44485d4b7 100644
--- a/.expeditor/habitat_test.yml
+++ b/.expeditor/artifact.habitat.yml
@@ -3,7 +3,7 @@ steps:
 
 - label: ":linux: Validate Habitat Builds of Chef InSpec"
   commands:
-    - /workdir/.expeditor/buildkite/habitat_test.sh
+    - /workdir/.expeditor/buildkite/artifact.habitat.test.sh
   expeditor:
     executor:
       linux:
@@ -12,7 +12,7 @@ steps:
 
 - label: ":windows: Validate Habitat Builds of Chef InSpec"
   commands:
-    - /workdir/.expeditor/buildkite/habitat_test.ps1
+    - /workdir/.expeditor/buildkite/artifact.habitat.test.ps1
   expeditor:
     executor:
       windows:
diff --git a/.expeditor/buildkite/habitat_test.ps1 b/.expeditor/buildkite/artifact.habitat.test.ps1
similarity index 100%
rename from .expeditor/buildkite/habitat_test.ps1
rename to .expeditor/buildkite/artifact.habitat.test.ps1
diff --git a/.expeditor/buildkite/habitat_test.sh b/.expeditor/buildkite/artifact.habitat.test.sh
similarity index 100%
rename from .expeditor/buildkite/habitat_test.sh
rename to .expeditor/buildkite/artifact.habitat.test.sh
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 9512b9a5b..9daabefcc 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -18,8 +18,6 @@ docker_images:
 
 pipelines:
  - habitat/build
- - habitat/test:
-     definition: .expeditor/habitat_test.yml
  - omnibus/release
  - omnibus/adhoc:
     definition: .expeditor/release.omnibus.yml
@@ -35,7 +33,6 @@ pipelines:
      - N: 5
  - coverage:
     description: Generate test coverage report
-    public: true
     env:
      - CI_ENABLE_COVERAGE: true
      - LANG: "C.UTF-8"
@@ -46,9 +43,9 @@ pipelines:
  - www/deploy:
     description: Deploy website to inspec.io
     definition: .expeditor/wwwdeploy.yml
- - verify/resources:
+ - integration/resources:
     description: Test core resources with test-kitchen.
-    definition: .expeditor/verify.resources.yml
+    definition: .expeditor/integration.resources.yml
  - integration/libraries:
     description: Integration with plugins, gems, resource packs.
     definition: .expeditor/integration.libraries.yml
@@ -61,6 +58,9 @@ pipelines:
  - integration/automate:
     description: Integration with Chef Automate
     definition: .expeditor/integration.automate.yml
+ - artifact/habitat:
+    description: Execute tests against the habitat artifact
+    definition: .expeditor/artifact.habitat.yml
 
 schedules:
  - name: integration_schedule
diff --git a/.expeditor/verify.resources.yml b/.expeditor/integration.resources.yml
similarity index 100%
rename from .expeditor/verify.resources.yml
rename to .expeditor/integration.resources.yml