diff --git a/.tekton/assets/sidecars.json b/.tekton/assets/sidecars.json index 6915c49a61..bda305806c 100644 --- a/.tekton/assets/sidecars.json +++ b/.tekton/assets/sidecars.json @@ -31,7 +31,7 @@ }, { "name": "zookeeper", - "image": "confluentinc/cp-zookeeper:7.9.1", + "image": " public.ecr.aws/aktosecurity/confluentinc-cp-zookeeper:7.9.2-1-ubi8", "env": [{ "name": "ZOOKEEPER_CLIENT_PORT", "value": "2181" }], "readinessProbe": { "tcpSocket": { @@ -42,32 +42,9 @@ "timeoutSeconds": 30 } }, - { - "name": "schema-registry", - "image": "confluentinc/cp-schema-registry:7.9.0", - "env": [ - { "name": "SCHEMA_REGISTRY_HOST_NAME", "value": "schema-registry" }, - { "name": "SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL", "value": "0.0.0.0:2181" }, - { "name": "SCHEMA_REGISTRY_LISTENERS", "value": "http://0.0.0.0:8081" }, - { - "name": "SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS", - "value": "PLAINTEXT://0.0.0.0:29092" - }, - { "name": "SCHEMA_REGISTRY_DEBUG", "value": "true" } - ], - "readinessProbe": { - "httpGet": { - "path": "/", - "port": 8081 - }, - "initialDelaySeconds": 5, - "periodSeconds": 2, - "timeoutSeconds": 60 - } - }, { "name": "kafka", - "image": "confluentinc/cp-kafka:7.9.1", + "image": "public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8", "env": [ { "name": "KAFKA_BROKER_ID", "value": "1" }, { "name": "KAFKA_ZOOKEEPER_CONNECT", "value": "localhost:2181" }, @@ -97,7 +74,7 @@ }, { "name": "kafka-topics", - "image": "confluentinc/cp-kafka:7.9.1", + "image": "public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8", "command": ["/bin/bash"], "args": [ "-lc", diff --git a/.tekton/generate-test-files.js b/.tekton/generate-test-files.js index ded563db7d..1fc0334515 100644 --- a/.tekton/generate-test-files.js +++ b/.tekton/generate-test-files.js @@ -9,7 +9,7 @@ const path = require('path'); const sidecarGroups = { redis: ['redis', 'redis-slave', 'redis-sentinel'], - kafka: ['zookeeper', 'kafka', 'kafka-topics', 'schema-registry'], + kafka: ['zookeeper', 'kafka', 'kafka-topics'], nats: ['nats', 'nats-streaming', 'nats-streaming-2'] }; @@ -213,7 +213,10 @@ function renderSidecar(sidecarName) { function generateTask(taskName, sidecars, options = {}) { const templateContent = fs.readFileSync(path.join(__dirname, 'templates/test-task.yaml.template'), 'utf-8'); - const sidecarYaml = sidecars.map(s => renderSidecar(s)).filter(Boolean).join('\n'); + const sidecarYaml = sidecars + .map(s => renderSidecar(s)) + .filter(Boolean) + .join('\n'); const availableSidecars = sidecars.join(','); const claimTests = options.scope === '@instana/collector' ? 'true' : 'false'; const totalTasks = options.split || '1'; @@ -318,11 +321,7 @@ function updatePipelineCollectorEntries(tasks) { ); } - const result = [ - ...lines.slice(0, firstCollectorLine), - ...newEntries, - ...lines.slice(afterLastCollectorLine) - ]; + const result = [...lines.slice(0, firstCollectorLine), ...newEntries, ...lines.slice(afterLastCollectorLine)]; fs.writeFileSync(pipelinePath, result.join('\n')); console.log(`Updated pipeline with ${tasks.length} collector task entries`); @@ -352,7 +351,9 @@ for (const [groupName, config] of Object.entries(packages)) { sidecarCounts[s] = (sidecarCounts[s] || 0) + 1; }); }); - const sidecarCountsStr = Object.entries(sidecarCounts).map(([k, v]) => `${k}=${v}`).join(','); + const sidecarCountsStr = Object.entries(sidecarCounts) + .map(([k, v]) => `${k}=${v}`) + .join(','); const collectorTasks_ = []; @@ -380,7 +381,10 @@ for (const [groupName, config] of Object.entries(packages)) { const runs = config.split ? Array.from({ length: config.split }, (_, i) => i + 1) : [1]; for (const number of runs) { - let sanitizedGroupName = groupName.replace(/:/g, '-').replace(/^test-/, '').replace(/^ci-/, ''); + let sanitizedGroupName = groupName + .replace(/:/g, '-') + .replace(/^test-/, '') + .replace(/^ci-/, ''); if (number > 1) { sanitizedGroupName = `${sanitizedGroupName}-split-${number}`; @@ -401,4 +405,3 @@ for (const [groupName, config] of Object.entries(packages)) { } console.log('\nDone!'); - diff --git a/.tekton/pipeline/default-pipeline.yaml b/.tekton/pipeline/default-pipeline.yaml index 668b1db62d..81cc46233a 100644 --- a/.tekton/pipeline/default-pipeline.yaml +++ b/.tekton/pipeline/default-pipeline.yaml @@ -416,14 +416,14 @@ spec: - name: collector-1-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: name: collector-1-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -435,21 +435,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-10-redis-task + - name: collector-2-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-10-redis + name: collector-2-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -461,21 +460,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-11-redis-task + - name: collector-3-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-11-redis + name: collector-3-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -487,21 +485,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-12-redis-task + - name: collector-4-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-12-redis + name: collector-4-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -513,21 +510,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-13-redis-task + - name: collector-5-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-13-redis + name: collector-5-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -539,21 +535,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-14-redis-task + - name: collector-6-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-14-redis + name: collector-6-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -565,21 +560,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-15-redis-task + - name: collector-7-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-15-redis + name: collector-7-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -591,21 +585,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-16-redis-task + - name: collector-8-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-16-redis + name: collector-8-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -617,21 +610,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-17-redis-task + - name: collector-9-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-17-redis + name: collector-9-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -643,21 +635,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-18-redis-task + - name: collector-10-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-18-redis + name: collector-10-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -669,21 +660,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-19-redis-task + - name: collector-11-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-19-redis + name: collector-11-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -695,21 +685,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-2-redis-task + - name: collector-12-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-2-redis + name: collector-12-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -721,21 +710,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-20-redis-task + - name: collector-13-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-20-redis + name: collector-13-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -747,21 +735,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-21-kafka-task + - name: collector-14-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-21-kafka + name: collector-14-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -773,21 +760,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-22-kafka-task + - name: collector-15-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-22-kafka + name: collector-15-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -799,21 +785,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-23-kafka-task + - name: collector-16-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-23-kafka + name: collector-16-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -825,21 +810,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-24-kafka-task + - name: collector-17-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-24-kafka + name: collector-17-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -851,21 +835,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-25-kafka-task + - name: collector-18-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-25-kafka + name: collector-18-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -877,21 +860,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-26-kafka-task + - name: collector-19-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-26-kafka + name: collector-19-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -903,21 +885,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-27-postgres-task + - name: collector-20-redis-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-27-postgres + name: collector-20-redis params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -929,21 +910,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-28-postgres-task + - name: collector-21-kafka-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-28-postgres + name: collector-21-kafka params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -955,21 +935,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-29-postgres-task + - name: collector-22-kafka-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-29-postgres + name: collector-22-kafka params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -981,21 +960,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-3-redis-task + - name: collector-23-kafka-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-3-redis + name: collector-23-kafka params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1007,21 +985,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-30-elasticsearch-task + - name: collector-24-kafka-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-30-elasticsearch + name: collector-24-kafka params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1033,21 +1010,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-31-elasticsearch-task + - name: collector-25-kafka-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-31-elasticsearch + name: collector-25-kafka params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1059,21 +1035,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-32-mongodb-task + - name: collector-26-kafka-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-32-mongodb + name: collector-26-kafka params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1085,21 +1060,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-33-couchbase-task + - name: collector-27-postgres-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-33-couchbase + name: collector-27-postgres params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1111,21 +1085,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-34-rabbitmq-task + - name: collector-28-postgres-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-34-rabbitmq + name: collector-28-postgres params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1137,21 +1110,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-35-nats-task + - name: collector-29-postgres-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-35-nats + name: collector-29-postgres params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1163,21 +1135,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-36-mysql-task + - name: collector-30-elasticsearch-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-36-mysql + name: collector-30-elasticsearch params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1189,21 +1160,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-37-localstack-task + - name: collector-31-elasticsearch-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-37-localstack + name: collector-31-elasticsearch params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1215,21 +1185,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-38-memcached-task + - name: collector-32-mongodb-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-38-memcached + name: collector-32-mongodb params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1241,21 +1210,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-39-oracledb-task + - name: collector-33-couchbase-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-39-oracledb + name: collector-33-couchbase params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1267,21 +1235,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-4-redis-task + - name: collector-34-rabbitmq-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-4-redis + name: collector-34-rabbitmq params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1293,21 +1260,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-5-redis-task + - name: collector-35-nats-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-5-redis + name: collector-35-nats params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1319,21 +1285,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-6-redis-task + - name: collector-36-mysql-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-6-redis + name: collector-36-mysql params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1345,21 +1310,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-7-redis-task + - name: collector-37-localstack-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-7-redis + name: collector-37-localstack params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1371,21 +1335,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-8-redis-task + - name: collector-38-memcached-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-8-redis + name: collector-38-memcached params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1397,21 +1360,20 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - - name: collector-9-redis-task + - name: collector-39-oracledb-task runAfter: - - prepare-test-env-task + - execute-tools taskRef: - name: collector-9-redis + name: collector-39-oracledb params: - name: node-version value: $(params.node-version) - name: npm-version - value: $(params.npm-version) + value: $(params.npm-version) - name: repository value: $(params.repository) - name: revision @@ -1423,11 +1385,10 @@ spec: - name: coverage value: $(params.coverage) - name: prerelease - value: $(params.prerelease) + value: $(params.prerelease) workspaces: - name: output workspace: artifacts - - name: core-task runAfter: - prepare-test-env-task diff --git a/.tekton/tasks/test-groups/collector-1-redis-task.yaml b/.tekton/tasks/test-groups/collector-1-redis-task.yaml index 8a9a1d9efa..339654f490 100644 --- a/.tekton/tasks/test-groups/collector-1-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-1-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-10-redis-task.yaml b/.tekton/tasks/test-groups/collector-10-redis-task.yaml index 274b4cd62e..9e17fef389 100644 --- a/.tekton/tasks/test-groups/collector-10-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-10-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-11-redis-task.yaml b/.tekton/tasks/test-groups/collector-11-redis-task.yaml index ecb0643235..ea2d2ffc27 100644 --- a/.tekton/tasks/test-groups/collector-11-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-11-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-12-redis-task.yaml b/.tekton/tasks/test-groups/collector-12-redis-task.yaml index f451988f6b..f82a4ab8bf 100644 --- a/.tekton/tasks/test-groups/collector-12-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-12-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-13-redis-task.yaml b/.tekton/tasks/test-groups/collector-13-redis-task.yaml index 8f8ed5767b..42de760582 100644 --- a/.tekton/tasks/test-groups/collector-13-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-13-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-14-redis-task.yaml b/.tekton/tasks/test-groups/collector-14-redis-task.yaml index bdcd08ca56..92f5724c2e 100644 --- a/.tekton/tasks/test-groups/collector-14-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-14-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-15-redis-task.yaml b/.tekton/tasks/test-groups/collector-15-redis-task.yaml index e9078df57b..af20373f63 100644 --- a/.tekton/tasks/test-groups/collector-15-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-15-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-16-redis-task.yaml b/.tekton/tasks/test-groups/collector-16-redis-task.yaml index b3f6a85ac6..37a0796405 100644 --- a/.tekton/tasks/test-groups/collector-16-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-16-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-17-redis-task.yaml b/.tekton/tasks/test-groups/collector-17-redis-task.yaml index 889526997d..2f3d2ef336 100644 --- a/.tekton/tasks/test-groups/collector-17-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-17-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-18-redis-task.yaml b/.tekton/tasks/test-groups/collector-18-redis-task.yaml index c9b3996c19..48eb8b763b 100644 --- a/.tekton/tasks/test-groups/collector-18-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-18-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-19-redis-task.yaml b/.tekton/tasks/test-groups/collector-19-redis-task.yaml index 66f8b4fc70..2211b9ef35 100644 --- a/.tekton/tasks/test-groups/collector-19-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-19-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-2-redis-task.yaml b/.tekton/tasks/test-groups/collector-2-redis-task.yaml index d760ee2ccb..4d1c543394 100644 --- a/.tekton/tasks/test-groups/collector-2-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-2-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-20-redis-task.yaml b/.tekton/tasks/test-groups/collector-20-redis-task.yaml index 4677214872..0cba043a23 100644 --- a/.tekton/tasks/test-groups/collector-20-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-20-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-21-kafka-task.yaml b/.tekton/tasks/test-groups/collector-21-kafka-task.yaml index 0eec4837c8..fd3f7c6dff 100644 --- a/.tekton/tasks/test-groups/collector-21-kafka-task.yaml +++ b/.tekton/tasks/test-groups/collector-21-kafka-task.yaml @@ -5,7 +5,7 @@ metadata: spec: sidecars: - name: zookeeper - image: confluentinc/cp-zookeeper:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-zookeeper:7.9.2-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -21,7 +21,7 @@ spec: periodSeconds: 2 timeoutSeconds: 30 - name: kafka - image: confluentinc/cp-kafka:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -49,7 +49,7 @@ spec: periodSeconds: 2 timeoutSeconds: 60 - name: kafka-topics - image: confluentinc/cp-kafka:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -60,31 +60,6 @@ spec: - "kafka_server=\"0.0.0.0:9092\"; kafka_topics=\"test test-topic test-batch-topic rdkafka-topic confluent-kafka-topic\"; until kafka-topics --bootstrap-server \"$kafka_server\" --list >/dev/null 2>&1; do echo 'waiting for Kafka...'; sleep 2; done; for t in $kafka_topics; do kafka-topics --bootstrap-server \"$kafka_server\" --create --if-not-exists --topic \"$t\"; done; echo 'All topics created.'" command: - "/bin/bash" - - name: schema-registry - image: confluentinc/cp-schema-registry:7.9.0 - imagePullPolicy: IfNotPresent - resources: - requests: - cpu: "500m" - memory: "1Gi" - env: - - name: "SCHEMA_REGISTRY_HOST_NAME" - value: "schema-registry" - - name: "SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL" - value: "0.0.0.0:2181" - - name: "SCHEMA_REGISTRY_LISTENERS" - value: "http://0.0.0.0:8081" - - name: "SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS" - value: "PLAINTEXT://0.0.0.0:29092" - - name: "SCHEMA_REGISTRY_DEBUG" - value: "true" - readinessProbe: - httpGet: - path: / - port: 8081 - initialDelaySeconds: 5 - periodSeconds: 2 - timeoutSeconds: 60 envFrom: - configMapRef: name: environment-properties @@ -160,8 +135,8 @@ spec: memory: "8Gi" script: | #!/bin/bash - AVAILABLE_SIDECARS="zookeeper,kafka,kafka-topics,schema-registry" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + AVAILABLE_SIDECARS="zookeeper,kafka,kafka-topics" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-22-kafka-task.yaml b/.tekton/tasks/test-groups/collector-22-kafka-task.yaml index 4e518f232f..69c49c32d4 100644 --- a/.tekton/tasks/test-groups/collector-22-kafka-task.yaml +++ b/.tekton/tasks/test-groups/collector-22-kafka-task.yaml @@ -5,7 +5,7 @@ metadata: spec: sidecars: - name: zookeeper - image: confluentinc/cp-zookeeper:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-zookeeper:7.9.2-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -21,7 +21,7 @@ spec: periodSeconds: 2 timeoutSeconds: 30 - name: kafka - image: confluentinc/cp-kafka:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -49,7 +49,7 @@ spec: periodSeconds: 2 timeoutSeconds: 60 - name: kafka-topics - image: confluentinc/cp-kafka:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -60,31 +60,6 @@ spec: - "kafka_server=\"0.0.0.0:9092\"; kafka_topics=\"test test-topic test-batch-topic rdkafka-topic confluent-kafka-topic\"; until kafka-topics --bootstrap-server \"$kafka_server\" --list >/dev/null 2>&1; do echo 'waiting for Kafka...'; sleep 2; done; for t in $kafka_topics; do kafka-topics --bootstrap-server \"$kafka_server\" --create --if-not-exists --topic \"$t\"; done; echo 'All topics created.'" command: - "/bin/bash" - - name: schema-registry - image: confluentinc/cp-schema-registry:7.9.0 - imagePullPolicy: IfNotPresent - resources: - requests: - cpu: "500m" - memory: "1Gi" - env: - - name: "SCHEMA_REGISTRY_HOST_NAME" - value: "schema-registry" - - name: "SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL" - value: "0.0.0.0:2181" - - name: "SCHEMA_REGISTRY_LISTENERS" - value: "http://0.0.0.0:8081" - - name: "SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS" - value: "PLAINTEXT://0.0.0.0:29092" - - name: "SCHEMA_REGISTRY_DEBUG" - value: "true" - readinessProbe: - httpGet: - path: / - port: 8081 - initialDelaySeconds: 5 - periodSeconds: 2 - timeoutSeconds: 60 envFrom: - configMapRef: name: environment-properties @@ -160,8 +135,8 @@ spec: memory: "8Gi" script: | #!/bin/bash - AVAILABLE_SIDECARS="zookeeper,kafka,kafka-topics,schema-registry" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + AVAILABLE_SIDECARS="zookeeper,kafka,kafka-topics" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-23-kafka-task.yaml b/.tekton/tasks/test-groups/collector-23-kafka-task.yaml index d6aef1949b..3eb119cd8c 100644 --- a/.tekton/tasks/test-groups/collector-23-kafka-task.yaml +++ b/.tekton/tasks/test-groups/collector-23-kafka-task.yaml @@ -5,7 +5,7 @@ metadata: spec: sidecars: - name: zookeeper - image: confluentinc/cp-zookeeper:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-zookeeper:7.9.2-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -21,7 +21,7 @@ spec: periodSeconds: 2 timeoutSeconds: 30 - name: kafka - image: confluentinc/cp-kafka:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -49,7 +49,7 @@ spec: periodSeconds: 2 timeoutSeconds: 60 - name: kafka-topics - image: confluentinc/cp-kafka:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -60,31 +60,6 @@ spec: - "kafka_server=\"0.0.0.0:9092\"; kafka_topics=\"test test-topic test-batch-topic rdkafka-topic confluent-kafka-topic\"; until kafka-topics --bootstrap-server \"$kafka_server\" --list >/dev/null 2>&1; do echo 'waiting for Kafka...'; sleep 2; done; for t in $kafka_topics; do kafka-topics --bootstrap-server \"$kafka_server\" --create --if-not-exists --topic \"$t\"; done; echo 'All topics created.'" command: - "/bin/bash" - - name: schema-registry - image: confluentinc/cp-schema-registry:7.9.0 - imagePullPolicy: IfNotPresent - resources: - requests: - cpu: "500m" - memory: "1Gi" - env: - - name: "SCHEMA_REGISTRY_HOST_NAME" - value: "schema-registry" - - name: "SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL" - value: "0.0.0.0:2181" - - name: "SCHEMA_REGISTRY_LISTENERS" - value: "http://0.0.0.0:8081" - - name: "SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS" - value: "PLAINTEXT://0.0.0.0:29092" - - name: "SCHEMA_REGISTRY_DEBUG" - value: "true" - readinessProbe: - httpGet: - path: / - port: 8081 - initialDelaySeconds: 5 - periodSeconds: 2 - timeoutSeconds: 60 envFrom: - configMapRef: name: environment-properties @@ -160,8 +135,8 @@ spec: memory: "8Gi" script: | #!/bin/bash - AVAILABLE_SIDECARS="zookeeper,kafka,kafka-topics,schema-registry" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + AVAILABLE_SIDECARS="zookeeper,kafka,kafka-topics" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-24-kafka-task.yaml b/.tekton/tasks/test-groups/collector-24-kafka-task.yaml index 31715010ab..504ca42781 100644 --- a/.tekton/tasks/test-groups/collector-24-kafka-task.yaml +++ b/.tekton/tasks/test-groups/collector-24-kafka-task.yaml @@ -5,7 +5,7 @@ metadata: spec: sidecars: - name: zookeeper - image: confluentinc/cp-zookeeper:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-zookeeper:7.9.2-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -21,7 +21,7 @@ spec: periodSeconds: 2 timeoutSeconds: 30 - name: kafka - image: confluentinc/cp-kafka:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -49,7 +49,7 @@ spec: periodSeconds: 2 timeoutSeconds: 60 - name: kafka-topics - image: confluentinc/cp-kafka:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -60,31 +60,6 @@ spec: - "kafka_server=\"0.0.0.0:9092\"; kafka_topics=\"test test-topic test-batch-topic rdkafka-topic confluent-kafka-topic\"; until kafka-topics --bootstrap-server \"$kafka_server\" --list >/dev/null 2>&1; do echo 'waiting for Kafka...'; sleep 2; done; for t in $kafka_topics; do kafka-topics --bootstrap-server \"$kafka_server\" --create --if-not-exists --topic \"$t\"; done; echo 'All topics created.'" command: - "/bin/bash" - - name: schema-registry - image: confluentinc/cp-schema-registry:7.9.0 - imagePullPolicy: IfNotPresent - resources: - requests: - cpu: "500m" - memory: "1Gi" - env: - - name: "SCHEMA_REGISTRY_HOST_NAME" - value: "schema-registry" - - name: "SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL" - value: "0.0.0.0:2181" - - name: "SCHEMA_REGISTRY_LISTENERS" - value: "http://0.0.0.0:8081" - - name: "SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS" - value: "PLAINTEXT://0.0.0.0:29092" - - name: "SCHEMA_REGISTRY_DEBUG" - value: "true" - readinessProbe: - httpGet: - path: / - port: 8081 - initialDelaySeconds: 5 - periodSeconds: 2 - timeoutSeconds: 60 envFrom: - configMapRef: name: environment-properties @@ -160,8 +135,8 @@ spec: memory: "8Gi" script: | #!/bin/bash - AVAILABLE_SIDECARS="zookeeper,kafka,kafka-topics,schema-registry" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + AVAILABLE_SIDECARS="zookeeper,kafka,kafka-topics" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-25-kafka-task.yaml b/.tekton/tasks/test-groups/collector-25-kafka-task.yaml index 0162f10bde..aaef82efb7 100644 --- a/.tekton/tasks/test-groups/collector-25-kafka-task.yaml +++ b/.tekton/tasks/test-groups/collector-25-kafka-task.yaml @@ -5,7 +5,7 @@ metadata: spec: sidecars: - name: zookeeper - image: confluentinc/cp-zookeeper:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-zookeeper:7.9.2-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -21,7 +21,7 @@ spec: periodSeconds: 2 timeoutSeconds: 30 - name: kafka - image: confluentinc/cp-kafka:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -49,7 +49,7 @@ spec: periodSeconds: 2 timeoutSeconds: 60 - name: kafka-topics - image: confluentinc/cp-kafka:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -60,31 +60,6 @@ spec: - "kafka_server=\"0.0.0.0:9092\"; kafka_topics=\"test test-topic test-batch-topic rdkafka-topic confluent-kafka-topic\"; until kafka-topics --bootstrap-server \"$kafka_server\" --list >/dev/null 2>&1; do echo 'waiting for Kafka...'; sleep 2; done; for t in $kafka_topics; do kafka-topics --bootstrap-server \"$kafka_server\" --create --if-not-exists --topic \"$t\"; done; echo 'All topics created.'" command: - "/bin/bash" - - name: schema-registry - image: confluentinc/cp-schema-registry:7.9.0 - imagePullPolicy: IfNotPresent - resources: - requests: - cpu: "500m" - memory: "1Gi" - env: - - name: "SCHEMA_REGISTRY_HOST_NAME" - value: "schema-registry" - - name: "SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL" - value: "0.0.0.0:2181" - - name: "SCHEMA_REGISTRY_LISTENERS" - value: "http://0.0.0.0:8081" - - name: "SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS" - value: "PLAINTEXT://0.0.0.0:29092" - - name: "SCHEMA_REGISTRY_DEBUG" - value: "true" - readinessProbe: - httpGet: - path: / - port: 8081 - initialDelaySeconds: 5 - periodSeconds: 2 - timeoutSeconds: 60 envFrom: - configMapRef: name: environment-properties @@ -160,8 +135,8 @@ spec: memory: "8Gi" script: | #!/bin/bash - AVAILABLE_SIDECARS="zookeeper,kafka,kafka-topics,schema-registry" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + AVAILABLE_SIDECARS="zookeeper,kafka,kafka-topics" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-26-kafka-task.yaml b/.tekton/tasks/test-groups/collector-26-kafka-task.yaml index 554082406a..2a1435acd2 100644 --- a/.tekton/tasks/test-groups/collector-26-kafka-task.yaml +++ b/.tekton/tasks/test-groups/collector-26-kafka-task.yaml @@ -5,7 +5,7 @@ metadata: spec: sidecars: - name: zookeeper - image: confluentinc/cp-zookeeper:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-zookeeper:7.9.2-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -21,7 +21,7 @@ spec: periodSeconds: 2 timeoutSeconds: 30 - name: kafka - image: confluentinc/cp-kafka:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -49,7 +49,7 @@ spec: periodSeconds: 2 timeoutSeconds: 60 - name: kafka-topics - image: confluentinc/cp-kafka:7.9.1 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 imagePullPolicy: IfNotPresent resources: requests: @@ -60,31 +60,6 @@ spec: - "kafka_server=\"0.0.0.0:9092\"; kafka_topics=\"test test-topic test-batch-topic rdkafka-topic confluent-kafka-topic\"; until kafka-topics --bootstrap-server \"$kafka_server\" --list >/dev/null 2>&1; do echo 'waiting for Kafka...'; sleep 2; done; for t in $kafka_topics; do kafka-topics --bootstrap-server \"$kafka_server\" --create --if-not-exists --topic \"$t\"; done; echo 'All topics created.'" command: - "/bin/bash" - - name: schema-registry - image: confluentinc/cp-schema-registry:7.9.0 - imagePullPolicy: IfNotPresent - resources: - requests: - cpu: "500m" - memory: "1Gi" - env: - - name: "SCHEMA_REGISTRY_HOST_NAME" - value: "schema-registry" - - name: "SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL" - value: "0.0.0.0:2181" - - name: "SCHEMA_REGISTRY_LISTENERS" - value: "http://0.0.0.0:8081" - - name: "SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS" - value: "PLAINTEXT://0.0.0.0:29092" - - name: "SCHEMA_REGISTRY_DEBUG" - value: "true" - readinessProbe: - httpGet: - path: / - port: 8081 - initialDelaySeconds: 5 - periodSeconds: 2 - timeoutSeconds: 60 envFrom: - configMapRef: name: environment-properties @@ -160,8 +135,8 @@ spec: memory: "8Gi" script: | #!/bin/bash - AVAILABLE_SIDECARS="zookeeper,kafka,kafka-topics,schema-registry" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + AVAILABLE_SIDECARS="zookeeper,kafka,kafka-topics" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-27-postgres-task.yaml b/.tekton/tasks/test-groups/collector-27-postgres-task.yaml index ad49c7500a..abd686caa0 100644 --- a/.tekton/tasks/test-groups/collector-27-postgres-task.yaml +++ b/.tekton/tasks/test-groups/collector-27-postgres-task.yaml @@ -103,7 +103,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="postgres" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-28-postgres-task.yaml b/.tekton/tasks/test-groups/collector-28-postgres-task.yaml index 89d9f21267..fc0eee9905 100644 --- a/.tekton/tasks/test-groups/collector-28-postgres-task.yaml +++ b/.tekton/tasks/test-groups/collector-28-postgres-task.yaml @@ -103,7 +103,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="postgres" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-29-postgres-task.yaml b/.tekton/tasks/test-groups/collector-29-postgres-task.yaml index c75add08c8..317311abda 100644 --- a/.tekton/tasks/test-groups/collector-29-postgres-task.yaml +++ b/.tekton/tasks/test-groups/collector-29-postgres-task.yaml @@ -103,7 +103,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="postgres" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-3-redis-task.yaml b/.tekton/tasks/test-groups/collector-3-redis-task.yaml index dce0f3c314..61ed05287c 100644 --- a/.tekton/tasks/test-groups/collector-3-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-3-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-30-elasticsearch-task.yaml b/.tekton/tasks/test-groups/collector-30-elasticsearch-task.yaml index 8ea0970e60..a113deaf1b 100644 --- a/.tekton/tasks/test-groups/collector-30-elasticsearch-task.yaml +++ b/.tekton/tasks/test-groups/collector-30-elasticsearch-task.yaml @@ -94,7 +94,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="elasticsearch" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-31-elasticsearch-task.yaml b/.tekton/tasks/test-groups/collector-31-elasticsearch-task.yaml index 73965c3ccd..5ceadc86ad 100644 --- a/.tekton/tasks/test-groups/collector-31-elasticsearch-task.yaml +++ b/.tekton/tasks/test-groups/collector-31-elasticsearch-task.yaml @@ -94,7 +94,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="elasticsearch" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-32-mongodb-task.yaml b/.tekton/tasks/test-groups/collector-32-mongodb-task.yaml index 13c98da114..273494ead2 100644 --- a/.tekton/tasks/test-groups/collector-32-mongodb-task.yaml +++ b/.tekton/tasks/test-groups/collector-32-mongodb-task.yaml @@ -87,7 +87,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="mongodb" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-33-couchbase-task.yaml b/.tekton/tasks/test-groups/collector-33-couchbase-task.yaml index 3f2d18c954..5714450379 100644 --- a/.tekton/tasks/test-groups/collector-33-couchbase-task.yaml +++ b/.tekton/tasks/test-groups/collector-33-couchbase-task.yaml @@ -94,7 +94,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="couchbase" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-34-rabbitmq-task.yaml b/.tekton/tasks/test-groups/collector-34-rabbitmq-task.yaml index 1ceb6a690c..3da243b813 100644 --- a/.tekton/tasks/test-groups/collector-34-rabbitmq-task.yaml +++ b/.tekton/tasks/test-groups/collector-34-rabbitmq-task.yaml @@ -93,7 +93,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="rabbitmq" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-35-nats-task.yaml b/.tekton/tasks/test-groups/collector-35-nats-task.yaml index d751810428..b637e7afb7 100644 --- a/.tekton/tasks/test-groups/collector-35-nats-task.yaml +++ b/.tekton/tasks/test-groups/collector-35-nats-task.yaml @@ -125,7 +125,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="nats,nats-streaming,nats-streaming-2" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-36-mysql-task.yaml b/.tekton/tasks/test-groups/collector-36-mysql-task.yaml index 08f6439ac8..5d6bdf87d3 100644 --- a/.tekton/tasks/test-groups/collector-36-mysql-task.yaml +++ b/.tekton/tasks/test-groups/collector-36-mysql-task.yaml @@ -109,7 +109,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="mysql" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-37-localstack-task.yaml b/.tekton/tasks/test-groups/collector-37-localstack-task.yaml index 6db46a6ec0..b27b44f1e4 100644 --- a/.tekton/tasks/test-groups/collector-37-localstack-task.yaml +++ b/.tekton/tasks/test-groups/collector-37-localstack-task.yaml @@ -87,7 +87,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="localstack" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-38-memcached-task.yaml b/.tekton/tasks/test-groups/collector-38-memcached-task.yaml index e6e72dcab0..228d2f6fb6 100644 --- a/.tekton/tasks/test-groups/collector-38-memcached-task.yaml +++ b/.tekton/tasks/test-groups/collector-38-memcached-task.yaml @@ -87,7 +87,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="memcached" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-39-oracledb-task.yaml b/.tekton/tasks/test-groups/collector-39-oracledb-task.yaml index cd5cabd18c..3be7a77fe5 100644 --- a/.tekton/tasks/test-groups/collector-39-oracledb-task.yaml +++ b/.tekton/tasks/test-groups/collector-39-oracledb-task.yaml @@ -90,7 +90,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="oracledb" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-4-redis-task.yaml b/.tekton/tasks/test-groups/collector-4-redis-task.yaml index c22ef27abb..f5c196889b 100644 --- a/.tekton/tasks/test-groups/collector-4-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-4-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-5-redis-task.yaml b/.tekton/tasks/test-groups/collector-5-redis-task.yaml index cc60a0987e..fe32178659 100644 --- a/.tekton/tasks/test-groups/collector-5-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-5-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-6-redis-task.yaml b/.tekton/tasks/test-groups/collector-6-redis-task.yaml index f309341b1e..86cbeedcd0 100644 --- a/.tekton/tasks/test-groups/collector-6-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-6-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-7-redis-task.yaml b/.tekton/tasks/test-groups/collector-7-redis-task.yaml index 29709f80f7..f2fb041d8f 100644 --- a/.tekton/tasks/test-groups/collector-7-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-7-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-8-redis-task.yaml b/.tekton/tasks/test-groups/collector-8-redis-task.yaml index 40d1a50cb3..f5257faa94 100644 --- a/.tekton/tasks/test-groups/collector-8-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-8-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/.tekton/tasks/test-groups/collector-9-redis-task.yaml b/.tekton/tasks/test-groups/collector-9-redis-task.yaml index c2625a0874..7eaec25983 100644 --- a/.tekton/tasks/test-groups/collector-9-redis-task.yaml +++ b/.tekton/tasks/test-groups/collector-9-redis-task.yaml @@ -118,7 +118,7 @@ spec: script: | #!/bin/bash AVAILABLE_SIDECARS="redis,redis-slave,redis-sentinel" - SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,schema-registry=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" + SIDECAR_COUNTS="redis=20,redis-slave=20,redis-sentinel=20,zookeeper=6,kafka=6,kafka-topics=6,postgres=3,elasticsearch=2,mongodb=1,couchbase=1,rabbitmq=1,nats=1,nats-streaming=1,nats-streaming-2=1,mysql=1,localstack=1,memcached=1,oracledb=1" ARTIFACTS_PATH="$(workspaces.output.path)" cd $ARTIFACTS_PATH BASE_REVISION=$(git rev-parse origin/main) diff --git a/docker-compose-base.yaml b/docker-compose-base.yaml index 552f2fec9f..bd17c3672d 100644 --- a/docker-compose-base.yaml +++ b/docker-compose-base.yaml @@ -2,6 +2,7 @@ version: '2' services: oracledb: image: container-registry.oracle.com/database/free:23.6.0.0-lite + pull_policy: if_not_present container_name: oracle-free ports: - "1521:1521" @@ -11,12 +12,14 @@ services: redis: image: public.ecr.aws/docker/library/redis:7.4.3 + pull_policy: if_not_present ports: - 6379:6379 # sentinel test setup redis-slave: image: public.ecr.aws/docker/library/redis:7.4.3 + pull_policy: if_not_present network_mode: host command: [ @@ -30,6 +33,7 @@ services: redis-sentinel: image: public.ecr.aws/docker/library/redis:7.4.3 + pull_policy: if_not_present network_mode: host command: > sh -c 'echo "sentinel monitor mymaster 127.0.0.1 6379 1" > /etc/sentinel.conf && @@ -41,11 +45,13 @@ services: mongo: image: public.ecr.aws/docker/library/mongo:8.0.8 + pull_policy: if_not_present ports: - 27017:27017 couchbase: image: public.ecr.aws/docker/library/couchbase:7.6.7 + pull_policy: if_not_present hostname: couchbase ports: - '8091-8096:8091-8096' @@ -55,6 +61,7 @@ services: # Elasticsearch 9 compatible with client v7 & v9 elasticsearch: image: public.ecr.aws/elastic/elasticsearch:9.0.0 + pull_policy: if_not_present ports: - 9200:9200 environment: @@ -63,7 +70,8 @@ services: xpack.security.enabled: 'false' zookeeper: - image: confluentinc/cp-zookeeper:7.9.0 + image: public.ecr.aws/aktosecurity/confluentinc-cp-zookeeper:7.9.2-1-ubi8 + pull_policy: if_not_present container_name: zookeeper environment: ZOOKEEPER_CLIENT_PORT: 2181 @@ -71,23 +79,24 @@ services: ports: - "2181:2181" - schema-registry: - image: confluentinc/cp-schema-registry:7.9.0 - hostname: schema-registry - depends_on: - - kafka - ports: - - "8081:8081" - environment: - SCHEMA_REGISTRY_HOST_NAME: schema-registry - SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181' - SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: "PLAINTEXT://kafka:29092" - SCHEMA_REGISTRY_DEBUG: 'true' + # schema-registry: + # image: confluentinc/cp-schema-registry:7.9.1 + # hostname: schema-registry + # depends_on: + # - kafka + # ports: + # - "8081:8081" + # environment: + # SCHEMA_REGISTRY_HOST_NAME: schema-registry + # SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181' + # SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: "PLAINTEXT://kafka:29092" + # SCHEMA_REGISTRY_DEBUG: 'true' kafka: # v7 = Kafka v3.9.x # https://docs.confluent.io/platform/current/installation/versions-interoperability.html - image: confluentinc/cp-kafka:7.9.0 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 + pull_policy: if_not_present hostname: kafka ports: - "9092:9092" @@ -104,7 +113,8 @@ services: KAFKA_DEFAULT_REPLICATION_FACTOR: 1 kafka-topics: - image: confluentinc/cp-kafka:7.9.0 + image: public.ecr.aws/aktosecurity/confluentinc-cp-kafka:7.9.1-1-ubi8 + pull_policy: if_not_present entrypoint: "/bin/bash" command: - -lc @@ -131,6 +141,7 @@ services: mysql: image: public.ecr.aws/docker/library/mysql:8.0.26 + pull_policy: if_not_present platform: linux/amd64 ports: - 3306:3306 @@ -146,6 +157,7 @@ services: postgres: image: public.ecr.aws/docker/library/postgres:15.15 + pull_policy: if_not_present ports: - 5432:5432 environment: @@ -155,6 +167,7 @@ services: mssql: image: mcr.microsoft.com/azure-sql-edge:1.0.7 + pull_policy: if_not_present platform: linux/arm64 ports: - 1433:1433 @@ -164,12 +177,14 @@ services: rabbitmq: image: public.ecr.aws/docker/library/rabbitmq:3.13.7-alpine + pull_policy: if_not_present ports: - 5671:5671 - 5672:5672 nats: image: public.ecr.aws/docker/library/nats:2.9.14-linux + pull_policy: if_not_present ports: - 4222:4222 - 6222:6222 @@ -177,6 +192,7 @@ services: nats-streaming: image: public.ecr.aws/docker/library/nats-streaming:0.25.3-linux + pull_policy: if_not_present command: -p 4223 -m 8223 ports: - 4223:4223 @@ -184,6 +200,7 @@ services: nats-streaming-2: image: public.ecr.aws/docker/library/nats-streaming:0.25.3-linux + pull_policy: if_not_present command: -p 4224 -m 8224 ports: - 4224:4224 @@ -191,12 +208,14 @@ services: memcached: image: public.ecr.aws/docker/library/memcached:1.6.9 + pull_policy: if_not_present ports: - 11211:11211 # https://hub.docker.com/r/ibmcom/db2 db2: image: icr.io/db2_community/db2 + pull_policy: if_not_present platform: linux/amd64 privileged: true ports: @@ -223,6 +242,7 @@ services: localstack: container_name: "${LOCALSTACK_DOCKER_NAME:-localstack-main}" image: public.ecr.aws/localstack/localstack:4.5 + pull_policy: if_not_present hostname: localstack ports: - "4566:4566" # LocalStack Gateway diff --git a/packages/collector/test/integration/currencies/messaging/@confluentinc/kafka-javascript/test_base.js b/packages/collector/test/integration/currencies/messaging/@confluentinc/kafka-javascript/test_base.js index 78526f8019..e7ac6e29d5 100644 --- a/packages/collector/test/integration/currencies/messaging/@confluentinc/kafka-javascript/test_base.js +++ b/packages/collector/test/integration/currencies/messaging/@confluentinc/kafka-javascript/test_base.js @@ -44,7 +44,7 @@ function verifyHttpExit(spans, parentSpan) { ]); } -// node bin/start-test-containers.js --zookeeper --kafka --schema-registry --kafka-topics +// node bin/start-test-containers.js --zookeeper --kafka --kafka-topics // Note: Node v25 does not currently support confluent-kafka // https://github.com/confluentinc/confluent-kafka-javascript/issues/397 module.exports = function (name, version, isLatest) { diff --git a/packages/collector/test/integration/currencies/messaging/kafka-node/test_base.js b/packages/collector/test/integration/currencies/messaging/kafka-node/test_base.js index 168b9eda58..22c2e2e6e9 100644 --- a/packages/collector/test/integration/currencies/messaging/kafka-node/test_base.js +++ b/packages/collector/test/integration/currencies/messaging/kafka-node/test_base.js @@ -18,7 +18,7 @@ const agentControls = globalAgent.instance; // FYI: officially deprecated. No release since 6 years. But still very // high usage on npm trends. We will drop in any upcoming major release. -// node bin/start-test-containers.js --zookeeper --kafka --schema-registry --kafka-topics +// node bin/start-test-containers.js --zookeeper --kafka --kafka-topics module.exports = function (name, version, isLatest) { this.timeout(config.getTestTimeout() * 2); diff --git a/packages/collector/test/integration/currencies/messaging/kafkajs/test_base.js b/packages/collector/test/integration/currencies/messaging/kafkajs/test_base.js index 7941221933..0b2fb93bfc 100644 --- a/packages/collector/test/integration/currencies/messaging/kafkajs/test_base.js +++ b/packages/collector/test/integration/currencies/messaging/kafkajs/test_base.js @@ -27,7 +27,7 @@ const retryTimeUntil = () => { return Date.now() + 60000; }; -// node bin/start-test-containers.js --zookeeper --kafka --schema-registry --kafka-topics +// node bin/start-test-containers.js --zookeeper --kafka --kafka-topics module.exports = function (name, version, isLatest, mode) { this.timeout(config.getTestTimeout() * 5);