Skip to content
Snippets Groups Projects
Commit a84cf59e authored by Andreas Polychronopoulos's avatar Andreas Polychronopoulos
Browse files

Merge branch 'helm-startup-changes' of... 

Merge branch 'helm-startup-changes' of https://labs.etsi.org/rep/osl/code/org.etsi.osl.main into helm-startup-changes
parents 37967b9f 0329bcbf
No related branches found
No related tags found
No related merge requests found
Pipeline #11955 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
compose/deploy.sh
+ 1
− 0
View file @ a84cf59e
...@@ -43,6 +43,7 @@ updaterepo org.etsi.osl.osom ...@@ -43,6 +43,7 @@ updaterepo org.etsi.osl.osom
updaterepo org.etsi.osl.oas updaterepo org.etsi.osl.oas
updaterepo org.etsi.osl.tmf.api updaterepo org.etsi.osl.tmf.api
updaterepo org.etsi.osl.cridge updaterepo org.etsi.osl.cridge
updaterepo org.etsi.osl.metrico
updaterepo org.etsi.osl.tmf.web updaterepo org.etsi.osl.tmf.web
updaterepo org.etsi.osl.portal.web updaterepo org.etsi.osl.portal.web
......
compose/docker-compose.yaml.configure
+ 9
− 9
View file @ a84cf59e
...@@ -86,7 +86,7 @@ services: ...@@ -86,7 +86,7 @@ services:
build: build:
context: ../../org.etsi.osl.portal.api/ context: ../../org.etsi.osl.portal.api/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"origins": "http://localhost", "origins": "http://localhost",
...@@ -134,7 +134,7 @@ services: ...@@ -134,7 +134,7 @@ services:
build: build:
context: ../../org.etsi.osl.mano/ context: ../../org.etsi.osl.mano/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
...@@ -160,7 +160,7 @@ services: ...@@ -160,7 +160,7 @@ services:
build: build:
context: ../../org.etsi.osl.bugzilla/ context: ../../org.etsi.osl.bugzilla/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
...@@ -186,7 +186,7 @@ services: ...@@ -186,7 +186,7 @@ services:
build: build:
context: ../../org.etsi.osl.tmf.api/ context: ../../org.etsi.osl.tmf.api/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"origins": "http://localhost", "origins": "http://localhost",
...@@ -234,7 +234,7 @@ services: ...@@ -234,7 +234,7 @@ services:
build: build:
context: ../../org.etsi.osl.osom/ context: ../../org.etsi.osl.osom/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"spring.datasource.url" : "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1", "spring.datasource.url" : "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1",
...@@ -260,7 +260,7 @@ services: ...@@ -260,7 +260,7 @@ services:
build: build:
context: ../../org.etsi.osl.oas/ context: ../../org.etsi.osl.oas/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"origins": "http://localhost", "origins": "http://localhost",
...@@ -302,7 +302,7 @@ services: ...@@ -302,7 +302,7 @@ services:
build: build:
context: ../../org.etsi.osl.cridge/ context: ../../org.etsi.osl.cridge/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
...@@ -331,7 +331,7 @@ services: ...@@ -331,7 +331,7 @@ services:
build: build:
context: ../../org.etsi.osl.metrico/ context: ../../org.etsi.osl.metrico/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"spring.datasource.url": "jdbc:mysql://amysql/metricodb?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC", "spring.datasource.url": "jdbc:mysql://amysql/metricodb?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC",
...@@ -376,7 +376,7 @@ services: ...@@ -376,7 +376,7 @@ services:
build: build:
context: ../../org.etsi.osl.centrallog.service/ context: ../../org.etsi.osl.centrallog.service/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
......
kubernetes/helm/openslice/values.yaml
+ 11
− 11
View file @ a84cf59e
...@@ -19,12 +19,12 @@ image: ...@@ -19,12 +19,12 @@ image:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "latest" tag: "develop"
centrallog: centrallog:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "latest" tag: "develop"
keycloak: keycloak:
repository: quay.io/keycloak/keycloak repository: quay.io/keycloak/keycloak
pullPolicy: Always pullPolicy: Always
...@@ -39,22 +39,22 @@ image: ...@@ -39,22 +39,22 @@ image:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "latest" tag: "develop"
osom: osom:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "latest" tag: "develop"
portalapi: portalapi:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "latest" tag: "develop"
osscapi: osscapi:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "latest" tag: "develop"
mysql: mysql:
repository: mysql repository: mysql
pullPolicy: Always pullPolicy: Always
...@@ -64,27 +64,27 @@ image: ...@@ -64,27 +64,27 @@ image:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "latest" tag: "develop"
portalweb: portalweb:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "latest" tag: "develop"
tmfweb: tmfweb:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "latest" tag: "develop"
cridge: cridge:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "latest" tag: "develop"
metrico: metrico:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico repository: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico
pullPolicy: Always pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "latest" tag: "develop"
bugzillaurl: example.com:443/bugzilla bugzillaurl: example.com:443/bugzilla
bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
......
pom.xml
+ 19
− 19
View file @ a84cf59e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<groupId>org.etsi.osl</groupId> <groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.main</artifactId> <artifactId>org.etsi.osl.main</artifactId>
<version>2024Q4</version> <version>2025Q2-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>org.etsi.osl.main</name> <name>org.etsi.osl.main</name>
...@@ -33,24 +33,24 @@ ...@@ -33,24 +33,24 @@
<springdoc-openapiui-version>1.7.0</springdoc-openapiui-version> <springdoc-openapiui-version>1.7.0</springdoc-openapiui-version>
<!-- osl components --> <!-- osl components -->
<org.etsi.osl.bugzilla.version>1.0.1</org.etsi.osl.bugzilla.version> <org.etsi.osl.bugzilla.version>1.0.2-SNAPSHOT</org.etsi.osl.bugzilla.version>
<org.etsi.osl.centrallog.client.version>1.0.1</org.etsi.osl.centrallog.client.version> <org.etsi.osl.centrallog.client.version>1.0.2-SNAPSHOT</org.etsi.osl.centrallog.client.version>
<org.etsi.osl.centrallog.service.version>1.0.1</org.etsi.osl.centrallog.service.version> <org.etsi.osl.centrallog.service.version>1.0.2-SNAPSHOT</org.etsi.osl.centrallog.service.version>
<org.etsi.osl.cridge.version>1.1.0</org.etsi.osl.cridge.version> <org.etsi.osl.cridge.version>1.2.0-SNAPSHOT</org.etsi.osl.cridge.version>
<org.etsi.osl.main.version>2024Q4</org.etsi.osl.main.version> <org.etsi.osl.main.version>2025Q2-SNAPSHOT</org.etsi.osl.main.version>
<org.etsi.osl.mano.version>1.0.1</org.etsi.osl.mano.version> <org.etsi.osl.mano.version>1.0.2-SNAPSHOT</org.etsi.osl.mano.version>
<org.etsi.osl.model.k8s.version>1.1.0</org.etsi.osl.model.k8s.version> <org.etsi.osl.model.k8s.version>1.1.1-SNAPSHOT</org.etsi.osl.model.k8s.version>
<org.etsi.osl.model.nfv.version>1.0.1</org.etsi.osl.model.nfv.version> <org.etsi.osl.model.nfv.version>1.0.2-SNAPSHOT</org.etsi.osl.model.nfv.version>
<org.etsi.osl.model.tmf.version>1.1.0</org.etsi.osl.model.tmf.version> <org.etsi.osl.model.tmf.version>1.2.0-SNAPSHOT</org.etsi.osl.model.tmf.version>
<org.etsi.osl.oas.version>1.0.1</org.etsi.osl.oas.version> <org.etsi.osl.oas.version>1.0.2-SNAPSHOT</org.etsi.osl.oas.version>
<org.etsi.osl.osom.version>1.1.0</org.etsi.osl.osom.version> <org.etsi.osl.osom.version>1.2.0-SNAPSHOT</org.etsi.osl.osom.version>
<org.etsi.osl.portal.api.version>1.0.1</org.etsi.osl.portal.api.version> <org.etsi.osl.portal.api.version>1.0.2-SNAPSHOT</org.etsi.osl.portal.api.version>
<org.etsi.osl.portal.web.version>1.0.1</org.etsi.osl.portal.web.version> <org.etsi.osl.portal.web.version>1.0.2-SNAPSHOT</org.etsi.osl.portal.web.version>
<org.etsi.osl.sol005nbi.osm.version>1.0.1</org.etsi.osl.sol005nbi.osm.version> <org.etsi.osl.sol005nbi.osm.version>1.0.2-SNAPSHOT</org.etsi.osl.sol005nbi.osm.version>
<org.etsi.osl.sol005nbi.osm10.version>1.0.1</org.etsi.osl.sol005nbi.osm10.version> <org.etsi.osl.sol005nbi.osm10.version>1.0.2-SNAPSHOT</org.etsi.osl.sol005nbi.osm10.version>
<org.etsi.osl.tmf.api.version>1.1.0</org.etsi.osl.tmf.api.version> <org.etsi.osl.tmf.api.version>1.2.0-SNAPSHOT</org.etsi.osl.tmf.api.version>
<org.etsi.osl.tmf.web.version>1.1.0</org.etsi.osl.tmf.web.version> <org.etsi.osl.tmf.web.version>1.2.0-SNAPSHOT</org.etsi.osl.tmf.web.version>
<org.etsi.osl.metrico.version>0.9</org.etsi.osl.metrico.version> <org.etsi.osl.metrico.version>1.0.0-SNAPSHOT</org.etsi.osl.metrico.version>
<!-- mainly for gw api --> <!-- mainly for gw api -->
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment