From e9f3eaaf14dcee4ab2e8650a1ba1713051590c84 Mon Sep 17 00:00:00 2001 From: Wout Slakhorst Date: Tue, 12 Nov 2024 09:02:07 +0100 Subject: [PATCH] remove unused files --- e2e-tests/clustering/memcached/docker-compose.yml | 4 +--- e2e-tests/clustering/memcached/node-A/html/ping | 1 - .../node-B/createsigningsessionrequesttemplate.json | 4 ---- e2e-tests/clustering/memcached/node-B/html/ping | 1 - e2e-tests/clustering/redis/docker-compose.yml | 4 +--- e2e-tests/clustering/redis/node-A/html/ping | 1 - .../node-B/createsigningsessionrequesttemplate.json | 4 ---- e2e-tests/clustering/redis/node-B/html/ping | 1 - e2e-tests/clustering/redis/sentinel/A/sentinel.conf | 12 ++++++++---- e2e-tests/clustering/redis/sentinel/B/sentinel.conf | 10 ++++++---- e2e-tests/clustering/redis/sentinel/C/sentinel.conf | 10 ++++++---- 11 files changed, 22 insertions(+), 30 deletions(-) delete mode 100644 e2e-tests/clustering/memcached/node-A/html/ping delete mode 100644 e2e-tests/clustering/memcached/node-B/createsigningsessionrequesttemplate.json delete mode 100644 e2e-tests/clustering/memcached/node-B/html/ping delete mode 100644 e2e-tests/clustering/redis/node-A/html/ping delete mode 100644 e2e-tests/clustering/redis/node-B/createsigningsessionrequesttemplate.json delete mode 100644 e2e-tests/clustering/redis/node-B/html/ping diff --git a/e2e-tests/clustering/memcached/docker-compose.yml b/e2e-tests/clustering/memcached/docker-compose.yml index 711fa1b7ba..3049b59af3 100644 --- a/e2e-tests/clustering/memcached/docker-compose.yml +++ b/e2e-tests/clustering/memcached/docker-compose.yml @@ -31,7 +31,6 @@ services: - "../../tls-certs/nodeA-certificate.pem:/etc/nginx/ssl/server.pem:ro" - "../../tls-certs/nodeA-certificate.pem:/etc/nginx/ssl/key.pem:ro" - "../../tls-certs/truststore.pem:/etc/nginx/ssl/truststore.pem:ro" - - "./node-A/html:/etc/nginx/html:ro" - "../../scripts/oauth2.js:/etc/nginx/oauth2.js:ro" nodeB-backend: image: "${IMAGE_NODE_B:-nutsfoundation/nuts-node:master}" @@ -58,5 +57,4 @@ services: - "../../shared_config/nodeB-http-nginx.conf:/etc/nginx/conf.d/nuts-http.conf:ro" - "../../tls-certs/nodeB-certificate.pem:/etc/nginx/ssl/server.pem:ro" - "../../tls-certs/nodeB-certificate.pem:/etc/nginx/ssl/key.pem:ro" - - "../../tls-certs/truststore.pem:/etc/nginx/ssl/truststore.pem:ro" - - "./node-B/html:/etc/nginx/html:ro" \ No newline at end of file + - "../../tls-certs/truststore.pem:/etc/nginx/ssl/truststore.pem:ro" \ No newline at end of file diff --git a/e2e-tests/clustering/memcached/node-A/html/ping b/e2e-tests/clustering/memcached/node-A/html/ping deleted file mode 100644 index ed53c21358..0000000000 --- a/e2e-tests/clustering/memcached/node-A/html/ping +++ /dev/null @@ -1 +0,0 @@ -pong \ No newline at end of file diff --git a/e2e-tests/clustering/memcached/node-B/createsigningsessionrequesttemplate.json b/e2e-tests/clustering/memcached/node-B/createsigningsessionrequesttemplate.json deleted file mode 100644 index aa14f51674..0000000000 --- a/e2e-tests/clustering/memcached/node-B/createsigningsessionrequesttemplate.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "means": "dummy", - "payload": "BASE64_CONTRACT" -} \ No newline at end of file diff --git a/e2e-tests/clustering/memcached/node-B/html/ping b/e2e-tests/clustering/memcached/node-B/html/ping deleted file mode 100644 index ed53c21358..0000000000 --- a/e2e-tests/clustering/memcached/node-B/html/ping +++ /dev/null @@ -1 +0,0 @@ -pong \ No newline at end of file diff --git a/e2e-tests/clustering/redis/docker-compose.yml b/e2e-tests/clustering/redis/docker-compose.yml index e36a9e3eb9..adb4c75c31 100644 --- a/e2e-tests/clustering/redis/docker-compose.yml +++ b/e2e-tests/clustering/redis/docker-compose.yml @@ -65,7 +65,6 @@ services: - "../../tls-certs/nodeA-certificate.pem:/etc/nginx/ssl/server.pem:ro" - "../../tls-certs/nodeA-certificate.pem:/etc/nginx/ssl/key.pem:ro" - "../../tls-certs/truststore.pem:/etc/nginx/ssl/truststore.pem:ro" - - "./node-A/html:/etc/nginx/html:ro" - "../../scripts/oauth2.js:/etc/nginx/oauth2.js:ro" nodeB-backend: image: "${IMAGE_NODE_B:-nutsfoundation/nuts-node:master}" @@ -92,5 +91,4 @@ services: - "../../shared_config/nodeB-http-nginx.conf:/etc/nginx/conf.d/nuts-http.conf:ro" - "../../tls-certs/nodeB-certificate.pem:/etc/nginx/ssl/server.pem:ro" - "../../tls-certs/nodeB-certificate.pem:/etc/nginx/ssl/key.pem:ro" - - "../../tls-certs/truststore.pem:/etc/nginx/ssl/truststore.pem:ro" - - "./node-B/html:/etc/nginx/html:ro" \ No newline at end of file + - "../../tls-certs/truststore.pem:/etc/nginx/ssl/truststore.pem:ro" \ No newline at end of file diff --git a/e2e-tests/clustering/redis/node-A/html/ping b/e2e-tests/clustering/redis/node-A/html/ping deleted file mode 100644 index ed53c21358..0000000000 --- a/e2e-tests/clustering/redis/node-A/html/ping +++ /dev/null @@ -1 +0,0 @@ -pong \ No newline at end of file diff --git a/e2e-tests/clustering/redis/node-B/createsigningsessionrequesttemplate.json b/e2e-tests/clustering/redis/node-B/createsigningsessionrequesttemplate.json deleted file mode 100644 index aa14f51674..0000000000 --- a/e2e-tests/clustering/redis/node-B/createsigningsessionrequesttemplate.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "means": "dummy", - "payload": "BASE64_CONTRACT" -} \ No newline at end of file diff --git a/e2e-tests/clustering/redis/node-B/html/ping b/e2e-tests/clustering/redis/node-B/html/ping deleted file mode 100644 index ed53c21358..0000000000 --- a/e2e-tests/clustering/redis/node-B/html/ping +++ /dev/null @@ -1 +0,0 @@ -pong \ No newline at end of file diff --git a/e2e-tests/clustering/redis/sentinel/A/sentinel.conf b/e2e-tests/clustering/redis/sentinel/A/sentinel.conf index 6d2eb79e09..3b2a859039 100644 --- a/e2e-tests/clustering/redis/sentinel/A/sentinel.conf +++ b/e2e-tests/clustering/redis/sentinel/A/sentinel.conf @@ -345,13 +345,17 @@ 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-replica mymaster 172.16.4.10 6379 -sentinel known-sentinel mymaster 172.16.4.8 26379 438e26b6ac8c551d3b53862a7a830378a3325ed3 +sentinel known-replica mymaster 172.16.4.11 6379 + +sentinel known-sentinel mymaster 172.16.4.9 26379 438e26b6ac8c551d3b53862a7a830378a3325ed3 + +sentinel known-sentinel mymaster 172.16.4.10 26379 f2b8569475e78470ea68ac3213020b849394f6bd sentinel known-sentinel mymaster 172.16.4.9 26379 a82fa5573e29b3ae905fc761bd1a0dcb574ec565 -sentinel known-sentinel mymaster 172.16.4.7 26379 f2b8569475e78470ea68ac3213020b849394f6bd +sentinel known-replica mymaster 172.16.4.8 6379 + +sentinel known-replica mymaster 172.16.4.7 6379 diff --git a/e2e-tests/clustering/redis/sentinel/B/sentinel.conf b/e2e-tests/clustering/redis/sentinel/B/sentinel.conf index 9b2bced63d..f45bb83679 100644 --- a/e2e-tests/clustering/redis/sentinel/B/sentinel.conf +++ b/e2e-tests/clustering/redis/sentinel/B/sentinel.conf @@ -347,11 +347,13 @@ sentinel current-epoch 0 sentinel known-replica mymaster 172.16.4.10 6379 -sentinel known-replica mymaster 172.16.4.7 6379 +sentinel known-replica mymaster 172.16.4.8 6379 -sentinel known-sentinel mymaster 172.16.4.7 26379 f2b8569475e78470ea68ac3213020b849394f6bd +sentinel known-sentinel mymaster 172.16.4.10 26379 f2b8569475e78470ea68ac3213020b849394f6bd -sentinel known-sentinel mymaster 172.16.4.9 26379 a82fa5573e29b3ae905fc761bd1a0dcb574ec565 +sentinel known-sentinel mymaster 172.16.4.11 26379 a82fa5573e29b3ae905fc761bd1a0dcb574ec565 -sentinel known-replica mymaster 172.16.4.8 6379 +sentinel known-replica mymaster 172.16.4.7 6379 + +sentinel known-sentinel mymaster 172.16.4.9 26379 438e26b6ac8c551d3b53862a7a830378a3325ed3 diff --git a/e2e-tests/clustering/redis/sentinel/C/sentinel.conf b/e2e-tests/clustering/redis/sentinel/C/sentinel.conf index 25c093f35c..ed7560df73 100644 --- a/e2e-tests/clustering/redis/sentinel/C/sentinel.conf +++ b/e2e-tests/clustering/redis/sentinel/C/sentinel.conf @@ -345,11 +345,13 @@ 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-replica mymaster 172.16.4.8 6379 -sentinel known-sentinel mymaster 172.16.4.8 26379 438e26b6ac8c551d3b53862a7a830378a3325ed3 +sentinel known-sentinel mymaster 172.16.4.9 26379 f2b8569475e78470ea68ac3213020b849394f6bd -sentinel known-sentinel mymaster 172.16.4.9 26379 a82fa5573e29b3ae905fc761bd1a0dcb574ec565 +sentinel known-sentinel mymaster 172.16.4.9 26379 438e26b6ac8c551d3b53862a7a830378a3325ed3 -sentinel known-replica mymaster 172.16.4.8 6379 +sentinel known-replica mymaster 172.16.4.7 6379 + +sentinel known-sentinel mymaster 172.16.4.11 26379 a82fa5573e29b3ae905fc761bd1a0dcb574ec565