diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59d3a5e..4be0ed4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,28 +68,13 @@ jobs: strategy: fail-fast: false matrix: - # This matrix allows us to test multiple bindplane versions with the - # correct set of resources. Connectors and fleets are only applied and - # queried when the version supports them. - include: - - bindplane_versions: 1.55.0 - support_connectors: false - support_fleets: false - - bindplane_versions: 1.59.0 - support_connectors: false - support_fleets: false - - bindplane_versions: 1.83.0 - support_connectors: true - support_fleets: false - - bindplane_versions: 1.91.0 - support_connectors: true - support_fleets: true - - bindplane_versions: 1.100.0 - support_connectors: true - support_fleets: true - - bindplane_versions: latest - support_connectors: true - support_fleets: true + # This matrix allows us to test multiple bindplane versions. All + # supported versions include connectors and fleets. + bindplane_versions: + - 1.91.0 + - 1.100.0 + - 1.102.0 + - latest steps: - name: Checkout uses: actions/checkout@v4 @@ -208,8 +193,8 @@ jobs: bindplane_username: admin bindplane_password: admin destination_path: test/resources/destinations/resource.yaml - connector_path: ${{ matrix.support_connectors && 'test/resources/connectors/resource.yaml' || '' }} - fleet_path: ${{ matrix.support_fleets && 'test/resources/fleets/resource.yaml' || '' }} + connector_path: test/resources/connectors/resource.yaml + fleet_path: test/resources/fleets/resource.yaml configuration_path: test/resources/configurations/resource.yaml configuration_output_dir: test/otel/${{ matrix.bindplane_versions }} configuration_output_branch: otel-raw-configs @@ -233,8 +218,8 @@ jobs: bindplane_password: admin # This is a directory processor_path: test/resources/processors - connector_path: ${{ matrix.support_connectors && 'test/resources/connectors' || '' }} - fleet_path: ${{ matrix.support_fleets && 'test/resources/fleets' || '' }} + connector_path: test/resources/connectors + fleet_path: test/resources/fleets # Should detect the resource in destinations/ and the # two resources in the 'multi' sub directory destination_path: test/resources/destinations @@ -249,12 +234,12 @@ jobs: docker exec bindplane /bindplane get configurations --tls-ca /ca.crt - name: Get Connectors - if: always() && matrix.support_connectors + if: always() run: | docker exec bindplane /bindplane get connector --tls-ca /ca.crt - name: Get Fleets - if: always() && matrix.support_fleets + if: always() run: | docker exec bindplane /bindplane get fleet --tls-ca /ca.crt diff --git a/test/resources/connectors/resource.yaml b/test/resources/connectors/resource.yaml index 4f6b864..fd4c728 100644 --- a/test/resources/connectors/resource.yaml +++ b/test/resources/connectors/resource.yaml @@ -5,7 +5,12 @@ metadata: name: test-routing-connector spec: type: routing - parameters: [] + parameters: + - name: telemetry_types + value: + - Metrics + - Logs + - Traces --- apiVersion: bindplane.observiq.com/v1 kind: Connector @@ -13,4 +18,9 @@ metadata: name: test-connector spec: type: routing - parameters: [] + parameters: + - name: telemetry_types + value: + - Metrics + - Logs + - Traces