Skip to content

Commit

Permalink
backport of commit 0bfecd1 (#2425)
Browse files Browse the repository at this point in the history
Co-authored-by: Michael Wilkerson <[email protected]>
  • Loading branch information
hc-github-team-consul-core and wilkermichael committed Jun 22, 2023
1 parent 33b5802 commit 0be1da1
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 0 deletions.
11 changes: 11 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,17 @@ kind-node-image:
kubectl-version:
@echo $(KUBECTL_VERSION)

kind-test-packages:
@./control-plane/build-support/scripts/set_test_package_matrix.sh "acceptance/ci-inputs/kind_acceptance_test_packages.yaml"

gke-test-packages:
@./control-plane/build-support/scripts/set_test_package_matrix.sh "acceptance/ci-inputs/gke_acceptance_test_packages.yaml"

eks-test-packages:
@./control-plane/build-support/scripts/set_test_package_matrix.sh "acceptance/ci-inputs/eks_acceptance_test_packages.yaml"

aks-test-packages:
@./control-plane/build-support/scripts/set_test_package_matrix.sh "acceptance/ci-inputs/aks_acceptance_test_packages.yaml"


# ===========> Release Targets
Expand Down
3 changes: 3 additions & 0 deletions acceptance/ci-inputs/aks_acceptance_test_packages.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- {runner: 0, test-packages: "connect peering snapshot-agent wan-federation"}
- {runner: 1, test-packages: "consul-dns example partitions metrics sync"}
- {runner: 2, test-packages: "basic cli config-entries api-gateway ingress-gateway terminating-gateway vault"}
3 changes: 3 additions & 0 deletions acceptance/ci-inputs/eks_acceptance_test_packages.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- {runner: 0, test-packages: "connect peering snapshot-agent wan-federation"}
- {runner: 1, test-packages: "consul-dns example partitions metrics sync"}
- {runner: 2, test-packages: "basic cli config-entries api-gateway ingress-gateway terminating-gateway vault"}
3 changes: 3 additions & 0 deletions acceptance/ci-inputs/gke_acceptance_test_packages.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- {runner: 0, test-packages: "connect peering snapshot-agent wan-federation"}
- {runner: 1, test-packages: "consul-dns example partitions metrics sync"}
- {runner: 2, test-packages: "basic cli config-entries api-gateway ingress-gateway terminating-gateway vault"}
6 changes: 6 additions & 0 deletions acceptance/ci-inputs/kind_acceptance_test_packages.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- {runner: 0, test-packages: "partitions"}
- {runner: 1, test-packages: "peering"}
- {runner: 2, test-packages: "connect snapshot-agent wan-federation"}
- {runner: 3, test-packages: "cli vault metrics"}
- {runner: 4, test-packages: "api-gateway ingress-gateway sync example consul-dns"}
- {runner: 5, test-packages: "config-entries terminating-gateway basic"}
12 changes: 12 additions & 0 deletions control-plane/build-support/scripts/set_test_package_matrix.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0

INPUT_FILE=$1

# convert readable yaml to json for github actions consumption
# do not include any pretty print, print to single line with -I 0
VALUE=$(yq eval 'select(fileIndex == 0)' "$INPUT_FILE" -o json -I 0)

echo "$VALUE"

0 comments on commit 0be1da1

Please sign in to comment.