Skip to content

Commit d45c946

Browse files
Merge branch 'master' into test-integration-stream-order
2 parents 0c7d358 + 5a400b1 commit d45c946

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

.github/workflows/dapr-perf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ jobs:
351351
DAPR_PERF_METRICS_PROMETHEUS_PUSHGATEWAY_URL: ${{ secrets.DAPR_PERF_METRICS_PROMETHEUS_PUSHGATEWAY_URL }}
352352
DAPR_PERF_METRICS_PROMETHEUS_PUSHGATEWAY_USERNAME: ${{ secrets.DAPR_PERF_METRICS_PROMETHEUS_PUSHGATEWAY_USERNAME }}
353353
DAPR_PERF_METRICS_PROMETHEUS_PUSHGATEWAY_PASSWORD: ${{ secrets.DAPR_PERF_METRICS_PROMETHEUS_PUSHGATEWAY_PASSWORD }}
354-
DAPR_SCHEDULER_IN_MEMORY_STORAGE: true
354+
DAPR_SCHEDULER_IN_MEMORY_STORAGE: false
355355
PULL_POLICY: IfNotPresent
356356
steps:
357357
- name: Setup test output

.github/workflows/dapr-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ env:
6767
DAPR_GO_BUILD_TAGS: "subtlecrypto"
6868
# Useful for upgrade/downgrade/compatibility tests
6969
# TODO: Make this auto-populated based on GitHub's releases.
70-
DAPR_TEST_N_MINUS_1_IMAGE: "ghcr.io/dapr/daprd:1.13.0"
71-
DAPR_TEST_N_MINUS_2_IMAGE: "ghcr.io/dapr/daprd:1.12.5"
70+
DAPR_TEST_N_MINUS_1_IMAGE: "ghcr.io/dapr/daprd:1.14.5"
71+
DAPR_TEST_N_MINUS_2_IMAGE: "ghcr.io/dapr/daprd:1.13.6"
7272

7373
jobs:
7474
deploy-infrastructure:

.github/workflows/kind-e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
DAPR_NAMESPACE: dapr-tests
5757
# Useful for upgrade/downgrade/compatibility tests
5858
# TODO: Make this auto-populated based on GitHub's releases.
59-
DAPR_TEST_N_MINUS_1_IMAGE: "ghcr.io/dapr/daprd:1.13.0"
60-
DAPR_TEST_N_MINUS_2_IMAGE: "ghcr.io/dapr/daprd:1.12.5"
59+
DAPR_TEST_N_MINUS_1_IMAGE: "ghcr.io/dapr/daprd:1.14.5"
60+
DAPR_TEST_N_MINUS_2_IMAGE: "ghcr.io/dapr/daprd:1.13.6"
6161
# Container registry where to cache e2e test images
6262
DAPR_CACHE_REGISTRY: "dapre2eacr.azurecr.io"
6363
PULL_POLICY: IfNotPresent
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
# Build the k6 binary with the extension
2-
FROM golang:1.24.1 as builder
2+
FROM golang:1.24.3 AS builder
3+
4+
WORKDIR $GOPATH/src/go.k6.io/k6
35

46
RUN go install go.k6.io/xk6/cmd/xk6@latest
5-
RUN xk6 build --output /k6 --with github.com/grafana/xk6-output-prometheus-remote@latest --with github.com/grafana/xk6-disruptor@350f53204c65040e71757f98a330665a8f189f91
7+
RUN xk6 build v0.56.0 \
8+
--output /k6 \
9+
--with github.com/grafana/xk6-output-prometheus-remote@latest \
10+
--with github.com/grafana/[email protected]
611

712
# Use the operator's base image and override the k6 binary
8-
FROM loadimpact/k6:latest
13+
FROM grafana/k6:latest
914
COPY --from=builder /k6 /usr/bin/k6

tests/test-infra/azure-aks.bicep

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,6 @@ resource aks 'Microsoft.ContainerService/managedClusters@2023-05-01' = {
163163
enablePrivateCluster: false
164164
}
165165
addonProfiles: {
166-
httpApplicationRouting: {
167-
enabled: true
168-
}
169166
azurepolicy: {
170167
enabled: false
171168
}

0 commit comments

Comments
 (0)