diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ea78d6c6187dd518ec9fb389aae2a666ba82c86..bb7d754baa751630b25598e182a30f062e9b6ebd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/Dockerfile b/Dockerfile index 16cb6ad840b2ca79c542ff399cfc53174f588ba5..f8fcd559916907bd5cd2a2f15837bcc367b20240 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/pom.xml b/pom.xml index 3bee24878b4ecbff47017c7411a7641ff7d73375..5fb311baea4bb6f66e463875734d1ce35adbfc0a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.etsi.osl org.etsi.osl.main - 1.0.0-SNAPSHOT + 1.0.0 ../org.etsi.osl.main diff --git a/src/main/java/portal/api/service/DeploymentDescriptorService.java b/src/main/java/portal/api/service/DeploymentDescriptorService.java index 7244d5446e4cc36e25884053393c7838d2234e8f..246c7b5bfe320e2aff97b69542a95064e8f62c74 100644 --- a/src/main/java/portal/api/service/DeploymentDescriptorService.java +++ b/src/main/java/portal/api/service/DeploymentDescriptorService.java @@ -226,7 +226,15 @@ public class DeploymentDescriptorService { Hibernate.initialize(dd.getDeploymentDescriptorVxFInstanceInfo()); Hibernate.initialize(dd.getMentor().getRoles()); Hibernate.initialize(dd.getInfrastructureForAll().getRefSupportedImages()); - Hibernate.initialize(dd.getExperiment().getConstituentVxF()); + 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());