Skip to content

Commit bae9b6c

Browse files
francoisferrandfrancoisferrand
committed
Merge branch 'improvement/ZENKO-4555' into w/2.7/improvement/ZENKO-4555 
2 parents 4476b4d + 6110768 commit bae9b6c

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

‎.github/scripts/end2end/bootstrap-kind.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -exu
44

5-
NODE_IMAGE=${1:-kindest/node:v1.22.4@sha256:ca3587e6e545a96c07bf82e2c46503d9ef86fc704f44c17577fca7bcabf5f978}
5+
NODE_IMAGE=${1:-kindest/node:v1.23.4@sha256:0e34f0d0fd448aa2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9}
66
VOLUME_ROOT=${2:-/artifacts}
77
WORKER_NODE_COUNT=${3:-0}
88
CLUSTER_NAME=${CLUSTER_NAME:-kind}

‎.github/scripts/end2end/requirements.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
KUBECTL_VERSION=1.21.1
4-
KIND_VERSION=v0.11.1
4+
KIND_VERSION=v0.12.0
55
HELM_VERSION=v3.5.3
66
KUSTOMIZE_VERSION=v4.4.1
77
YQ_VERSION=v4.27.5

‎.github/workflows/end2end.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env:
2323
WORKER_COUNT: '2'
2424
OPERATOR_REPO: [email protected]:scality/zenko-operator.git
2525
OPERATOR_IMAGE: ""
26-
KIND_NODE_IMAGE: "kindest/node:v1.22.4@sha256:ca3587e6e545a96c07bf82e2c46503d9ef86fc704f44c17577fca7bcabf5f978"
26+
KIND_NODE_IMAGE: "kindest/node:v1.23.4@sha256:0e34f0d0fd448aa2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9"
2727
VOLUME_ROOT: /artifacts
2828
OIDC_REALM: "zenko"
2929
OIDC_CLIENT_ID: "zenko-ui"
@@ -99,7 +99,7 @@ env:
9999
SKOPEO_VERSION: "v1.5.2"
100100
KUBECTL_VERSION: "1.21.1"
101101
TILT_VERSION: "0.23.4"
102-
KIND_VERSION: "v0.11.1"
102+
KIND_VERSION: "v0.12.0"
103103
ZENKO_ENABLE_SOSAPI: false
104104

105105
jobs:

‎solution/deps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cloudserver:
1616
sourceRegistry: registry.scality.com/cloudserver
1717
dashboard: cloudserver-dashboards
1818
image: cloudserver
19-
tag: 8.7.11
19+
tag: 8.7.16
2020
envsubst: CLOUDSERVER_TAG
2121
jmx-javaagent:
2222
sourceRegistry: banzaicloud

‎solution/kafka-connect/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN apk update && apk upgrade && apk add --no-cache curl zip
1414

1515
ARG MONGODB_CONNECTOR_VERSION=1.7.0
1616
WORKDIR /tmp
17-
RUN curl -LO https://search.maven.org/remotecontent?filepath=org/mongodb/kafka/mongo-kafka-connect/${MONGODB_CONNECTOR_VERSION}/mongo-kafka-connect-${MONGODB_CONNECTOR_VERSION}-all.jar && \
17+
RUN curl -LO https://repo1.maven.org/maven2/org/mongodb/kafka/mongo-kafka-connect/${MONGODB_CONNECTOR_VERSION}/mongo-kafka-connect-${MONGODB_CONNECTOR_VERSION}-all.jar && \
1818
mv /tmp/mongo-kafka-connect-${MONGODB_CONNECTOR_VERSION}-all.jar /tmp/mongo-kafka-connect.jar
1919

2020
# Use Kafka base image

‎tests/ctst/features/notifications.feature

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ Feature: Bucket notifications
6363
| Non versioned | s3:ObjectCreated:* | s3:ObjectCreated:Copy | without | filter | receive | 0 |
6464
| Non versioned | s3:ObjectCreated:Put | s3:ObjectCreated:Put | without | filter | receive | 0 |
6565
| Non versioned | s3:ObjectCreated:Copy | s3:ObjectCreated:Copy | without | filter | receive | 0 |
66-
| Non versioned | s3:ObjectRemoved:* | s3:ObjectRemoved:Delete | without | filter | receive | 0 |
67-
| Non versioned | s3:ObjectRemoved:Delete | s3:ObjectRemoved:Delete | without | filter | receive | 0 |
66+
#| Non versioned | s3:ObjectRemoved:* | s3:ObjectRemoved:Delete | without | filter | receive | 0 |
67+
#| Non versioned | s3:ObjectRemoved:Delete | s3:ObjectRemoved:Delete | without | filter | receive | 0 |
6868
| Non versioned | s3:ObjectTagging:* | s3:ObjectTagging:Put | without | filter | receive | 0 |
6969
| Non versioned | s3:ObjectTagging:* | s3:ObjectTagging:Delete | without | filter | receive | 0 |
7070
| Non versioned | s3:ObjectTagging:Put | s3:ObjectTagging:Put | without | filter | receive | 0 |
@@ -73,9 +73,9 @@ Feature: Bucket notifications
7373
| Versioned | s3:ObjectCreated:* | s3:ObjectCreated:Copy | without | filter | receive | 0 |
7474
| Versioned | s3:ObjectCreated:Put | s3:ObjectCreated:Put | without | filter | receive | 0 |
7575
| Versioned | s3:ObjectCreated:Copy | s3:ObjectCreated:Copy | without | filter | receive | 0 |
76-
| Versioned | s3:ObjectRemoved:* | s3:ObjectRemoved:Delete | without | filter | receive | 0 |
76+
#| Versioned | s3:ObjectRemoved:* | s3:ObjectRemoved:Delete | without | filter | receive | 0 |
7777
| Versioned | s3:ObjectRemoved:* | s3:ObjectRemoved:DeleteMarkerCreated | without | filter | receive | 0 |
78-
| Versioned | s3:ObjectRemoved:Delete | s3:ObjectRemoved:Delete | without | filter | receive | 0 |
78+
#| Versioned | s3:ObjectRemoved:Delete | s3:ObjectRemoved:Delete | without | filter | receive | 0 |
7979
| Versioned | s3:ObjectRemoved:DeleteMarkerCreated | s3:ObjectRemoved:DeleteMarkerCreated | without | filter | receive | 0 |
8080
| Versioned | s3:ObjectTagging:* | s3:ObjectTagging:Put | without | filter | receive | 0 |
8181
| Versioned | s3:ObjectTagging:* | s3:ObjectTagging:Delete | without | filter | receive | 0 |
@@ -147,8 +147,8 @@ Feature: Bucket notifications
147147
| Non versioned | s3:ObjectCreated:Copy | with | suffix | receive | 0 |
148148
| Non versioned | s3:ObjectCreated:Copy | without | prefix | not receive | 0 |
149149
| Non versioned | s3:ObjectCreated:Copy | without | suffix | not receive | 0 |
150-
| Non versioned | s3:ObjectRemoved:Delete | with | prefix | receive | 0 |
151-
| Non versioned | s3:ObjectRemoved:Delete | with | suffix | receive | 0 |
150+
#| Non versioned | s3:ObjectRemoved:Delete | with | prefix | receive | 0 |
151+
#| Non versioned | s3:ObjectRemoved:Delete | with | suffix | receive | 0 |
152152
| Non versioned | s3:ObjectRemoved:Delete | without | prefix | not receive | 0 |
153153
| Non versioned | s3:ObjectRemoved:Delete | without | suffix | not receive | 0 |
154154
| Non versioned | s3:ObjectTagging:Put | with | prefix | receive | 0 |

0 commit comments

Comments
 (0)