diff options
author | Christopher A. Snapp <csnapp@chef.io> | 2020-06-18 15:22:58 -0600 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2020-06-26 08:34:56 -0700 |
commit | 64399ce2e5245915a9e80408037446a5fa7a6247 (patch) | |
tree | 5318eddc5504437cdf841c784d5fdb1269feb493 /.expeditor | |
parent | 29f47e72a4d53d12358fc44fa0ec1ebf61f97dca (diff) | |
download | chef-64399ce2e5245915a9e80408037446a5fa7a6247.tar.gz |
Remove Azure private verify pipeline
We no longer need the private pipeline for verification tests using
Kitchen Azure now that we have an implementation using Azure DevOps
Pipelines for MacOS and Windows 2019.
Signed-off-by: Christopher A. Snapp <csnapp@chef.io>
Diffstat (limited to '.expeditor')
-rwxr-xr-x | .expeditor/cleanup_orphaned_test_resources.sh | 15 | ||||
-rw-r--r-- | .expeditor/config.yml | 12 | ||||
-rw-r--r-- | .expeditor/verify.pipeline.yml (renamed from .expeditor/verify_public.pipeline.yml) | 0 | ||||
-rw-r--r-- | .expeditor/verify_private.pipeline.yml | 41 |
4 files changed, 0 insertions, 68 deletions
diff --git a/.expeditor/cleanup_orphaned_test_resources.sh b/.expeditor/cleanup_orphaned_test_resources.sh deleted file mode 100755 index ccf1c7473a..0000000000 --- a/.expeditor/cleanup_orphaned_test_resources.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -echo "--- Setting up Azure credentials" -export VAULT_UTIL_SECRETS="{\"ARM_TENANT_ID\":{\"account\":\"azure/engineering-dev-test\",\"field\":\"tenant_id\"},\"ARM_CLIENT_ID\":{\"account\":\"azure/engineering-dev-test\",\"field\":\"client_id\"},\"ARM_CLIENT_SECRET\":{\"account\":\"azure/engineering-dev-test\",\"field\":\"client_secret\"}}" -. <(vault-util fetch-secret-env) - -# this allows time for the new service-principal to become available -sleep 10 - -az login --service-principal --tenant "$ARM_TENANT_ID" --username "$ARM_CLIENT_ID" --password "$ARM_CLIENT_SECRET" - -echo "--- Deleting Azure kitchen-end-to-end-windows-10 resource groups" -az group list --query "[?starts_with(name, 'kitchen-end-to-end-windows-10-')].name" --output tsv | xargs -n1 -t -I% az group delete -y --no-wait --name "%" diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 3323d1f470..090a31808a 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -25,10 +25,7 @@ docker_images: pipelines: - verify: - definition: .expeditor/verify_public.pipeline.yml public: true - - verify/private: - definition: .expeditor/verify_private.pipeline.yml - verify/habitat: description: > A temporary pipeline to verify the habitat plans. Performs a local build, @@ -69,11 +66,6 @@ github: - chef-14: version_constraint: 14* -schedules: - - name: cleanup_orphaned_test_resources - description: Cleanup orphaned test resources - cronline: "0 1 * * *" # every day at 1am - changelog: rollup_header: Changes not yet released to stable @@ -101,10 +93,6 @@ merge_actions: only_if: built_in:bump_version subscriptions: - - workload: schedule_triggered:{{agent_id}}:cleanup_orphaned_test_resources:* - actions: - - bash:.expeditor/cleanup_orphaned_test_resources.sh - # the omnibus/docker/gem chain - workload: artifact_published:unstable:chef:{{version_constraint}} actions: diff --git a/.expeditor/verify_public.pipeline.yml b/.expeditor/verify.pipeline.yml index 60142e9928..60142e9928 100644 --- a/.expeditor/verify_public.pipeline.yml +++ b/.expeditor/verify.pipeline.yml diff --git a/.expeditor/verify_private.pipeline.yml b/.expeditor/verify_private.pipeline.yml deleted file mode 100644 index 5d62c77ae3..0000000000 --- a/.expeditor/verify_private.pipeline.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -expeditor: - cached_folders: - - vendor - defaults: - buildkite: - retry: - automatic: - limit: 1 - timeout_in_minutes: 30 - -steps: - -######################################################################### - # START TEST KITCHEN ONLY -######################################################################### - -- label: "Kitchen Tests Windows 10" - commands: - - scripts/bk_tests/bk_linux_exec.sh - - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-windows-10 - artifact_paths: - - $PWD/.kitchen/logs/kitchen.log - env: - KITCHEN_YAML: kitchen.azure.yml - expeditor: - executor: - linux: - privileged: true - single-use: true - secrets: - AZURE_TENANT_ID: - account: azure/engineering-dev-test - field: tenant_id - AZURE_CLIENT_ID: - account: azure/engineering-dev-test - field: client_id - AZURE_CLIENT_SECRET: - account: azure/engineering-dev-test - field: client_secret |