deduplicate configs

nuts-foundation · Nov 19, 2024 · 2aa24c0 · 2aa24c0
1 parent bb6abcd
commit 2aa24c0
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 115 deletions.
diff --git a/e2e-tests/clustering/redis/docker-compose.yml b/e2e-tests/clustering/redis/docker-compose.yml
@@ -10,14 +10,14 @@ services:
       - redisA
     command: redis-server /redis/conf/redis.conf
     volumes:
-      - "./slave/B:/redis/conf:ro"
+      - "./slave:/redis/conf:ro"
   redisC:
     image: *image
     depends_on:
       - redisA
     command: redis-server /redis/conf/redis.conf
     volumes:
-      - "./slave/C:/redis/conf:ro"
+      - "./slave:/redis/conf:ro"
   sentinelA:
     image: *image
     depends_on:

diff --git a/e2e-tests/clustering/redis/sentinel/A/sentinel.conf b/e2e-tests/clustering/redis/sentinel/A/sentinel.conf
@@ -11,17 +11,4 @@ sentinel deny-scripts-reconfig yes
 sentinel resolve-hostnames yes
 sentinel announce-hostnames yes
 
-# Generated by CONFIG REWRITE
-
-latency-tracking-info-percentiles 50 99 99.9
-user default on nopass sanitize-payload ~* &* +@all
-sentinel myid d2edd2fd2762267af463b772e543253e17b00ec9
-sentinel config-epoch mymaster 0
-sentinel leader-epoch mymaster 0
-sentinel current-epoch 0
-
-sentinel known-replica mymaster 172.16.4.7 6379
-
-sentinel known-sentinel mymaster 172.16.4.9 26379 acdeeaa3cb7c53bf8965ba3046d1f212ef2bd342
-
-sentinel known-sentinel mymaster 172.16.4.10 26379 bd75ae05071650f196c7ecdffb4abea1271c1e27
+# Generated by CONFIG REWRITE
diff --git a/e2e-tests/clustering/redis/sentinel/B/sentinel.conf b/e2e-tests/clustering/redis/sentinel/B/sentinel.conf
@@ -11,17 +11,4 @@ sentinel deny-scripts-reconfig yes
 sentinel resolve-hostnames yes
 sentinel announce-hostnames yes
 
-# Generated by CONFIG REWRITE
-
-latency-tracking-info-percentiles 50 99 99.9
-user default on nopass sanitize-payload ~* &* +@all
-sentinel myid acdeeaa3cb7c53bf8965ba3046d1f212ef2bd342
-sentinel config-epoch mymaster 0
-sentinel leader-epoch mymaster 0
-sentinel current-epoch 0
-
-sentinel known-replica mymaster 172.16.4.7 6379
-
-sentinel known-sentinel mymaster 172.16.4.10 26379 bd75ae05071650f196c7ecdffb4abea1271c1e27
-
-sentinel known-sentinel mymaster 172.16.4.8 26379 d2edd2fd2762267af463b772e543253e17b00ec9
+# Generated by CONFIG REWRITE
diff --git a/e2e-tests/clustering/redis/sentinel/C/sentinel.conf b/e2e-tests/clustering/redis/sentinel/C/sentinel.conf
@@ -11,17 +11,4 @@ sentinel deny-scripts-reconfig yes
 sentinel resolve-hostnames yes
 sentinel announce-hostnames yes
 
-# Generated by CONFIG REWRITE
-
-latency-tracking-info-percentiles 50 99 99.9
-user default on nopass sanitize-payload ~* &* +@all
-sentinel myid bd75ae05071650f196c7ecdffb4abea1271c1e27
-sentinel config-epoch mymaster 0
-sentinel leader-epoch mymaster 0
-sentinel current-epoch 0
-
-sentinel known-replica mymaster 172.16.4.7 6379
-
-sentinel known-sentinel mymaster 172.16.4.9 26379 acdeeaa3cb7c53bf8965ba3046d1f212ef2bd342
-
-sentinel known-sentinel mymaster 172.16.4.8 26379 d2edd2fd2762267af463b772e543253e17b00ec9
+# Generated by CONFIG REWRITE
diff --git a/e2e-tests/clustering/redis/slave/C/redis.conf b/e2e-tests/clustering/redis/slave/C/redis.conf
diff --git a/...tests/clustering/redis/slave/B/redis.conf → e2e-tests/clustering/redis/slave/redis.conf b/...tests/clustering/redis/slave/B/redis.conf → e2e-tests/clustering/redis/slave/redis.conf