diff options
| -rw-r--r-- | forwarding/pom.xml | 2 | ||||
| -rw-r--r-- | main/pom.xml | 2 | ||||
| -rw-r--r-- | model/pom.xml | 2 | ||||
| -rw-r--r-- | packages/policy-distribution-docker/pom.xml | 2 | ||||
| -rw-r--r-- | packages/policy-distribution-docker/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | packages/policy-distribution-tarball/pom.xml | 2 | ||||
| -rw-r--r-- | packages/pom.xml | 2 | ||||
| -rw-r--r-- | plugins/forwarding-plugins/pom.xml | 2 | ||||
| -rw-r--r-- | plugins/pom.xml | 2 | ||||
| -rw-r--r-- | plugins/reception-plugins/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 8 | ||||
| -rw-r--r-- | reception/pom.xml | 2 | ||||
| -rw-r--r-- | releases/3.1.3-container.yaml | 8 | ||||
| -rw-r--r-- | releases/3.1.3.yaml | 5 | ||||
| -rw-r--r-- | testsuites/performance/pom.xml | 2 | ||||
| -rw-r--r-- | testsuites/pom.xml | 2 | ||||
| -rw-r--r-- | testsuites/run-s3p-test.sh | 4 | ||||
| -rw-r--r-- | testsuites/stability/pom.xml | 2 | ||||
| -rw-r--r-- | testsuites/stability/src/main/resources/setup/config/jsonConfigs/pdpSimConfig.json | 13 | ||||
| -rw-r--r-- | testsuites/stability/src/main/resources/setup/config/papParameters.yaml | 37 | ||||
| -rw-r--r-- | testsuites/stability/src/main/resources/setup/docker-compose.yml | 48 | ||||
| -rw-r--r-- | version.properties | 6 |
22 files changed, 91 insertions, 66 deletions
diff --git a/forwarding/pom.xml b/forwarding/pom.xml index 19c051d6..717bc836 100644 --- a/forwarding/pom.xml +++ b/forwarding/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>policy-distribution</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>forwarding</artifactId> diff --git a/main/pom.xml b/main/pom.xml index ac1f2fca..0cfd505f 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>policy-distribution</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-main</artifactId> diff --git a/model/pom.xml b/model/pom.xml index b254861f..052389a9 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>policy-distribution</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-model</artifactId> diff --git a/packages/policy-distribution-docker/pom.xml b/packages/policy-distribution-docker/pom.xml index 2a2432da..a8cfffe5 100644 --- a/packages/policy-distribution-docker/pom.xml +++ b/packages/policy-distribution-docker/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>distribution-packages</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <packaging>pom</packaging> diff --git a/packages/policy-distribution-docker/src/main/docker/Dockerfile b/packages/policy-distribution-docker/src/main/docker/Dockerfile index 09c3347d..3bddef35 100644 --- a/packages/policy-distribution-docker/src/main/docker/Dockerfile +++ b/packages/policy-distribution-docker/src/main/docker/Dockerfile @@ -25,7 +25,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/policy-distribution.tar.gz /packages/ RUN tar xvzf /packages/policy-distribution.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.1.3-SNAPSHOT +FROM onap/policy-jre-alpine:4.0.0-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy SDC Service Distribution" diff --git a/packages/policy-distribution-tarball/pom.xml b/packages/policy-distribution-tarball/pom.xml index 0fc798a9..e6dc237e 100644 --- a/packages/policy-distribution-tarball/pom.xml +++ b/packages/policy-distribution-tarball/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>distribution-packages</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>policy-distribution-tarball</artifactId> diff --git a/packages/pom.xml b/packages/pom.xml index a181f63d..617d4d10 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>policy-distribution</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-packages</artifactId> diff --git a/plugins/forwarding-plugins/pom.xml b/plugins/forwarding-plugins/pom.xml index a6422d1e..f6a5944a 100644 --- a/plugins/forwarding-plugins/pom.xml +++ b/plugins/forwarding-plugins/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>distribution-plugins</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>forwarding-plugins</artifactId> diff --git a/plugins/pom.xml b/plugins/pom.xml index a6685655..e4feb79f 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>policy-distribution</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-plugins</artifactId> diff --git a/plugins/reception-plugins/pom.xml b/plugins/reception-plugins/pom.xml index 18987fed..339b9484 100644 --- a/plugins/reception-plugins/pom.xml +++ b/plugins/reception-plugins/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>distribution-plugins</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>reception-plugins</artifactId> @@ -28,13 +28,13 @@ <parent> <groupId>org.onap.policy.parent</groupId> <artifactId>integration</artifactId> - <version>4.1.3-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath /> </parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>policy-distribution</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -45,8 +45,8 @@ <!-- Default Sonar configuration --> <jacoco.dataFile>${project.basedir}/../target/code-coverage/jacoco-ut.exec</jacoco.dataFile> - <policy.common.version>2.1.3-SNAPSHOT</policy.common.version> - <policy.models.version>3.1.3-SNAPSHOT</policy.models.version> + <policy.common.version>3.0.0-SNAPSHOT</policy.common.version> + <policy.models.version>4.0.0-SNAPSHOT</policy.models.version> <surefireArgLine> --add-opens java.base/java.lang=ALL-UNNAMED </surefireArgLine> diff --git a/reception/pom.xml b/reception/pom.xml index d56c25e7..540c2876 100644 --- a/reception/pom.xml +++ b/reception/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>policy-distribution</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>reception</artifactId> diff --git a/releases/3.1.3-container.yaml b/releases/3.1.3-container.yaml new file mode 100644 index 00000000..29e0b8f4 --- /dev/null +++ b/releases/3.1.3-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '3.1.3' +project: 'policy-distribution' +log_dir: 'policy-distribution-maven-docker-stage-master/1406' +ref: 1f5825999ad5966ddb63acb0c2a710686972ddca +containers: + - name: 'policy-distribution' + version: '3.1.3-20240516T1540' diff --git a/releases/3.1.3.yaml b/releases/3.1.3.yaml new file mode 100644 index 00000000..f81ed723 --- /dev/null +++ b/releases/3.1.3.yaml @@ -0,0 +1,5 @@ +distribution_type: 'maven' +version: '3.1.3' +project: 'policy-distribution' +tag_release: false +log_dir: 'policy-distribution-maven-stage-master/1407/' diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml index 860091a2..ebd1141c 100644 --- a/testsuites/performance/pom.xml +++ b/testsuites/performance/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>distribution-testsuites</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-performance</artifactId> <build> diff --git a/testsuites/pom.xml b/testsuites/pom.xml index 77010fa0..e3227d90 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>policy-distribution</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-testsuites</artifactId> <packaging>pom</packaging> diff --git a/testsuites/run-s3p-test.sh b/testsuites/run-s3p-test.sh index 00f8643e..a0c53b46 100644 --- a/testsuites/run-s3p-test.sh +++ b/testsuites/run-s3p-test.sh @@ -1,6 +1,6 @@ #!/bin/bash # ============LICENSE_START======================================================= -# Copyright (c) 2023 Nordix Foundation. +# Copyright (c) 2023-2024 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -87,7 +87,7 @@ sudo apt install -y wget unzip # Install JMeter mkdir -p ~/jmeter -wget https://dlcdn.apache.org//jmeter/binaries/apache-jmeter-5.5.zip # check if valid version +wget https://archive.apache.org/dist/jmeter/binaries/apache-jmeter-5.5.zip # check if valid version unzip -q -d ~/jmeter apache-jmeter-5.5.zip rm apache-jmeter-5.5.zip diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml index 74aa7ed1..96811841 100644 --- a/testsuites/stability/pom.xml +++ b/testsuites/stability/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.distribution</groupId> <artifactId>distribution-testsuites</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>distribution-stability</artifactId> <build> diff --git a/testsuites/stability/src/main/resources/setup/config/jsonConfigs/pdpSimConfig.json b/testsuites/stability/src/main/resources/setup/config/jsonConfigs/pdpSimConfig.json index d809955f..3459ca11 100644 --- a/testsuites/stability/src/main/resources/setup/config/jsonConfigs/pdpSimConfig.json +++ b/testsuites/stability/src/main/resources/setup/config/jsonConfigs/pdpSimConfig.json @@ -19,20 +19,21 @@ "topicParameterGroup": { "topicSources": [ { - "topic": "POLICY-PDP-PAP", + "topic": "policy-pdp-pap", "servers": [ - "message-router:3904" + "kafka:9092" ], - "topicCommInfrastructure": "dmaap" + "fetchTimeout": 15000, + "topicCommInfrastructure": "kafka" } ], "topicSinks": [ { - "topic": "POLICY-PDP-PAP", + "topic": "policy-pdp-pap", "servers": [ - "message-router:3904" + "kafka:9092" ], - "topicCommInfrastructure": "dmaap" + "topicCommInfrastructure": "kafka" } ] } diff --git a/testsuites/stability/src/main/resources/setup/config/papParameters.yaml b/testsuites/stability/src/main/resources/setup/config/papParameters.yaml index 40203653..72353958 100644 --- a/testsuites/stability/src/main/resources/setup/config/papParameters.yaml +++ b/testsuites/stability/src/main/resources/setup/config/papParameters.yaml @@ -12,9 +12,6 @@ spring: username: policy_user password: policy_user jpa: - properties: - hibernate: - dialect: org.hibernate.dialect.MariaDB103Dialect hibernate: ddl-auto: none naming: @@ -32,9 +29,9 @@ pap: name: PapGroup aaf: false topic: - pdp-pap.name: POLICY-PDP-PAP - notification.name: POLICY-NOTIFICATION - heartbeat.name: POLICY-HEARTBEAT + pdp-pap.name: policy-pdp-pap + notification.name: policy-notification + heartbeat.name: policy-heartbeat pdpParameters: heartBeatMs: 120000 updateParameters: @@ -46,30 +43,30 @@ pap: savePdpStatisticsInDb: true topicParameterGroup: topicSources: - - topic: POLICY-PDP-PAP + - topic: ${pap.topic.pdp-pap.name} servers: - - message-router - topicCommInfrastructure: dmaap + - kafka:9092 + topicCommInfrastructure: kafka useHttps: false fetchTimeout: 15000 - - topic: POLICY-HEARTBEAT - effectiveTopic: POLICY-PDP-PAP + - topic: ${pap.topic.heartbeat.name} + effectiveTopic: ${pap.topic.pdp-pap.name} consumerGroup: policy-pap servers: - - message-router - topicCommInfrastructure: dmaap + - kafka:9092 + topicCommInfrastructure: kafka useHttps: false fetchTimeout: 15000 topicSinks: - - topic: POLICY-PDP-PAP + - topic: ${pap.topic.pdp-pap.name} servers: - - message-router - topicCommInfrastructure: dmaap + - kafka:9092 + topicCommInfrastructure: kafka useHttps: false - - topic: POLICY-NOTIFICATION + - topic: ${pap.topic.notification.name} servers: - - message-router - topicCommInfrastructure: dmaap + - kafka:9092 + topicCommInfrastructure: kafka useHttps: false healthCheckRestClientParameters: - clientName: api @@ -88,4 +85,4 @@ management: include: health, metrics, prometheus path-mapping: -metrics: plain-metrics - -prometheus: metrics
\ No newline at end of file + -prometheus: metrics diff --git a/testsuites/stability/src/main/resources/setup/docker-compose.yml b/testsuites/stability/src/main/resources/setup/docker-compose.yml index 2fd77d7b..75dd9280 100644 --- a/testsuites/stability/src/main/resources/setup/docker-compose.yml +++ b/testsuites/stability/src/main/resources/setup/docker-compose.yml @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (C) 2021-2023 Nordix Foundation. +# Copyright (C) 2021-2024 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -49,23 +49,12 @@ services: '/opt/app/policy/bin/db_migrator_policy_init.sh', 'mariadb', '3306' ] - simulator: - image: nexus3.onap.org:10001/onap/policy-models-simulator:${POLICY_MODELS_SIMULATOR} - container_name: simulator - hostname: simulator - networks: - default: - aliases: - - message-router - expose: - - 3904 - volumes: - - ./config/jsonConfigs/dmaapSimConfig.json:/opt/app/policy/simulators/etc/mounted/simParameters.json:ro + pdp: image: pdp/simulator container_name: pdp-simulator depends_on: - - simulator + - kafka hostname: pdp-simulator volumes: - ./config/wait_for_port.sh:/opt/app/policy/pdp-sim/bin/wait_for_port.sh:ro @@ -95,7 +84,7 @@ services: - 6969 depends_on: - policy-db-migrator - - simulator + - kafka - policy-api volumes: - ./config/wait_for_port.sh:/opt/app/policy/pap/bin/wait_for_port.sh:ro @@ -105,7 +94,7 @@ services: command: [ '-c', './policy-pap.sh', 'mariadb', '3306', - 'message-router', '3904', + 'kafka', '9092', 'policy-api', '6969' ] policy-dist: @@ -126,7 +115,32 @@ services: command: [ '-c', './policy-dist.sh', 'mariadb', '3306', - 'message-router', '3904', + 'kafka', '9092', 'policy-api', '6969', 'policy-pap', '6969' ] + + zookeeper: + image: confluentinc/cp-zookeeper:latest + container_name: zookeeper + environment: + ZOOKEEPER_CLIENT_PORT: 2181 + ZOOKEEPER_TICK_TIME: 2000 + ports: + - "2181:2181" + + kafka: + image: confluentinc/cp-kafka:latest + container_name: kafka + depends_on: + - zookeeper + ports: + - "29092:29092" + - "9092:9092" + environment: + KAFKA_BROKER_ID: 1 + KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 + KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092 + KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT + KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT + KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 diff --git a/version.properties b/version.properties index 95476595..19e0714b 100644 --- a/version.properties +++ b/version.properties @@ -2,9 +2,9 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -major=3 -minor=1 -patch=3 +major=4 +minor=0 +patch=0 base_version=${major}.${minor}.${patch} |