Loading .gitlab-ci.yml +9 −1 Changes for .gitlab-ci.yml: 9 added lines, 1 removed line. Original line number Original line Diff line number Diff line Loading @@ -15,13 +15,21 @@ include: rules: rules: - if: '$CI_COMMIT_REF_NAME == "develop"' - 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 - project: osl/code/org.etsi.osl.main ref: develop ref: develop file: file: - ci-templates/default.yml - ci-templates/default.yml - ci-templates/build_unprotected.yml - ci-templates/build_unprotected.yml rules: 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: maven_build: extends: .maven_build extends: .maven_build Loading Dockerfile +2 −2 Changes for Dockerfile: 2 added lines, 2 removed lines. Original line number Original line Diff line number Diff line Loading @@ -2,6 +2,6 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk MAINTAINER openslice.io MAINTAINER openslice.io RUN mkdir /opt/shareclasses RUN mkdir /opt/shareclasses RUN mkdir -p /opt/openslice/lib/ RUN mkdir -p /opt/openslice/lib/ COPY target/org.etsi.osl.portal.api-1.0.0-SNAPSHOT.jar /opt/openslice/lib/ 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-SNAPSHOT.jar"] CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.portal.api-1.0.0.jar"] EXPOSE 13000 EXPOSE 13000 No newline at end of file pom.xml +1 −1 Changes for pom.xml: 1 added line, 1 removed line. Original line number Original line Diff line number Diff line Loading @@ -5,7 +5,7 @@ <parent> <parent> <groupId>org.etsi.osl</groupId> <groupId>org.etsi.osl</groupId> <artifactId>org.etsi.osl.main</artifactId> <artifactId>org.etsi.osl.main</artifactId> <version>1.0.0-SNAPSHOT</version> <version>1.0.0</version> <relativePath>../org.etsi.osl.main</relativePath> <relativePath>../org.etsi.osl.main</relativePath> </parent> </parent> Loading src/main/java/portal/api/service/DeploymentDescriptorService.java +8 Changes for src/main/java/portal/api/service/DeploymentDescriptorService.java: 8 added lines, 0 removed lines. Original line number Original line Diff line number Diff line Loading @@ -227,6 +227,14 @@ public class DeploymentDescriptorService { Hibernate.initialize(dd.getMentor().getRoles()); Hibernate.initialize(dd.getMentor().getRoles()); Hibernate.initialize(dd.getInfrastructureForAll().getRefSupportedImages()); 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().getCategories()); Hibernate.initialize(dd.getExperimentFullDetails().getExtensions()); Hibernate.initialize(dd.getExperimentFullDetails().getExtensions()); Hibernate.initialize(dd.getExperimentFullDetails().getValidationJobs()); Hibernate.initialize(dd.getExperimentFullDetails().getValidationJobs()); Loading Loading
.gitlab-ci.yml +9 −1 Changes for .gitlab-ci.yml: 9 added lines, 1 removed line. Original line number Original line Diff line number Diff line Loading @@ -15,13 +15,21 @@ include: rules: rules: - if: '$CI_COMMIT_REF_NAME == "develop"' - 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 - project: osl/code/org.etsi.osl.main ref: develop ref: develop file: file: - ci-templates/default.yml - ci-templates/default.yml - ci-templates/build_unprotected.yml - ci-templates/build_unprotected.yml rules: 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: maven_build: extends: .maven_build extends: .maven_build Loading
Dockerfile +2 −2 Changes for Dockerfile: 2 added lines, 2 removed lines. Original line number Original line Diff line number Diff line Loading @@ -2,6 +2,6 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk MAINTAINER openslice.io MAINTAINER openslice.io RUN mkdir /opt/shareclasses RUN mkdir /opt/shareclasses RUN mkdir -p /opt/openslice/lib/ RUN mkdir -p /opt/openslice/lib/ COPY target/org.etsi.osl.portal.api-1.0.0-SNAPSHOT.jar /opt/openslice/lib/ 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-SNAPSHOT.jar"] CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.portal.api-1.0.0.jar"] EXPOSE 13000 EXPOSE 13000 No newline at end of file
pom.xml +1 −1 Changes for pom.xml: 1 added line, 1 removed line. Original line number Original line Diff line number Diff line Loading @@ -5,7 +5,7 @@ <parent> <parent> <groupId>org.etsi.osl</groupId> <groupId>org.etsi.osl</groupId> <artifactId>org.etsi.osl.main</artifactId> <artifactId>org.etsi.osl.main</artifactId> <version>1.0.0-SNAPSHOT</version> <version>1.0.0</version> <relativePath>../org.etsi.osl.main</relativePath> <relativePath>../org.etsi.osl.main</relativePath> </parent> </parent> Loading
src/main/java/portal/api/service/DeploymentDescriptorService.java +8 Changes for src/main/java/portal/api/service/DeploymentDescriptorService.java: 8 added lines, 0 removed lines. Original line number Original line Diff line number Diff line Loading @@ -227,6 +227,14 @@ public class DeploymentDescriptorService { Hibernate.initialize(dd.getMentor().getRoles()); Hibernate.initialize(dd.getMentor().getRoles()); Hibernate.initialize(dd.getInfrastructureForAll().getRefSupportedImages()); 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().getCategories()); Hibernate.initialize(dd.getExperimentFullDetails().getExtensions()); Hibernate.initialize(dd.getExperimentFullDetails().getExtensions()); Hibernate.initialize(dd.getExperimentFullDetails().getValidationJobs()); Hibernate.initialize(dd.getExperimentFullDetails().getValidationJobs()); Loading