Commit 93f82ba5 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '2024Q2_RC' into 'develop' 

Merging 2024Q2_RC into develop

See merge request !7
parents 7ae61247 b5ed529e

.gitlab-ci.yml

+9 −1
Original line number Diff line number Diff line
@@ -15,13 +15,21 @@ include: 
    rules:

      - if: '$CI_COMMIT_REF_NAME == "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: $CI_COMMIT_REF_NAME

    file: 

      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: develop

    file: 

      - ci-templates/default.yml

      - ci-templates/build_unprotected.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'



maven_build:

  extends: .maven_build

Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk 
MAINTAINER openslice.io

RUN mkdir /opt/shareclasses

RUN mkdir -p /opt/openslice/lib/

COPY target/org.etsi.osl.portal.api-1.0.0-SNAPSHOT.jar /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.portal.api-1.0.0-SNAPSHOT.jar"]

COPY target/org.etsi.osl.portal.api-1.0.0.jar /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.portal.api-1.0.0.jar"]

EXPOSE 13000
 
 No newline at end of file

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
	<parent>

		<groupId>org.etsi.osl</groupId>

		<artifactId>org.etsi.osl.main</artifactId>

		<version>1.0.0-SNAPSHOT</version>

		<version>1.0.0</version>

		<relativePath>../org.etsi.osl.main</relativePath>

	</parent>

src/main/java/portal/api/service/DeploymentDescriptorService.java

+9 −1
Original line number Diff line number Diff line
@@ -227,6 +227,14 @@ public class DeploymentDescriptorService { 
	        Hibernate.initialize(dd.getMentor().getRoles());

	        Hibernate.initialize(dd.getInfrastructureForAll().getRefSupportedImages());

            Hibernate.initialize(dd.getExperiment().getConstituentVxF());

            for (ConstituentVxF cvxf : dd.getExperiment().getConstituentVxF()) {

              Hibernate.initialize( cvxf.getVxfref().getCategories());

              Hibernate.initialize( cvxf.getVxfref().getExtensions() );

              Hibernate.initialize( cvxf.getVxfref().getValidationJobs() );

              Hibernate.initialize( cvxf.getVxfref().getSupportedMANOPlatforms() );

              Hibernate.initialize( cvxf.getVxfref().getVxfOnBoardedDescriptors() );

              Hibernate.initialize( cvxf.getVxfref().getVfimagesVDU() );

            }

	        Hibernate.initialize(dd.getExperimentFullDetails().getCategories());

	        Hibernate.initialize(dd.getExperimentFullDetails().getExtensions());

	        Hibernate.initialize(dd.getExperimentFullDetails().getValidationJobs());