Commit 3b8666cd authored by Markus Mirz's avatar Markus Mirz
Browse files

use cgmes by default


Signed-off-by: Markus Mirz's avatarMarkus Mirz <mmirz@eonerc.rwth-aachen.de>
parent 9ae99941
...@@ -27,15 +27,16 @@ stages: ...@@ -27,15 +27,16 @@ stages:
tags: tags:
- docker - docker
docker:fedora: docker:fedora-cim:
<<: *docker-fedora-template <<: *docker-fedora-template
variables: variables:
TAGS: --tag ${DOCKER_IMAGE_DEV}:${CI_COMMIT_REF_NAME} --tag ${DOCKER_IMAGE_DEV}:latest TAGS: --tag ${DOCKER_IMAGE_DEV}:${CI_COMMIT_REF_NAME}-cim
BUILD_ARGS: --build-arg CIM_VERSION=IEC61970_16v29a
docker:fedora-cgmes: docker:fedora-cgmes:
<<: *docker-fedora-template <<: *docker-fedora-template
variables: variables:
TAGS: --tag ${DOCKER_IMAGE_DEV}:${CI_COMMIT_REF_NAME}-CGMES_2.4.15_16FEB2016 TAGS: --tag ${DOCKER_IMAGE_DEV}:${CI_COMMIT_REF_NAME}-cgmes --tag ${DOCKER_IMAGE_DEV}:latest
BUILD_ARGS: --build-arg CIM_VERSION=CGMES_2.4.15_16FEB2016 BUILD_ARGS: --build-arg CIM_VERSION=CGMES_2.4.15_16FEB2016
docker:centos: docker:centos:
...@@ -49,15 +50,15 @@ docker:centos: ...@@ -49,15 +50,15 @@ docker:centos:
tags: tags:
- docker - docker
build:linux: build:linux-cim:
stage: build stage: build
needs: ["docker:fedora"] needs: ["docker:fedora-cim"]
script: script:
- mkdir -p build - mkdir -p build
- cd build - cd build
- cmake .. - cmake -DCIM_VERSION=IEC61970_16v29a ..
- make -j 32 - make -j 32
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-cim
cache: cache:
paths: paths:
- build - build
...@@ -76,7 +77,7 @@ build:linux-cgmes: ...@@ -76,7 +77,7 @@ build:linux-cgmes:
- cd build - cd build
- cmake -DCIM_VERSION=CGMES_2.4.15_16FEB2016 .. - cmake -DCIM_VERSION=CGMES_2.4.15_16FEB2016 ..
- make -j 32 - make -j 32
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-CGMES_2.4.15_16FEB2016 image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-cgmes
cache: cache:
paths: paths:
- build - build
...@@ -249,14 +250,14 @@ build:docker: ...@@ -249,14 +250,14 @@ build:docker:
test:jupyter: test:jupyter:
stage: test stage: test
needs: ["build:linux"] needs: ["build:linux-cim"]
variables: variables:
PYTHONPATH: "build/Source/Python:Source/Python" PYTHONPATH: "build/Source/Python:Source/Python"
script: script:
- pytest -v Examples/Notebooks - pytest -v Examples/Notebooks
dependencies: dependencies:
- build:linux - build:linux-cim
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-cim
tags: tags:
- docker - docker
artifacts: artifacts:
...@@ -272,7 +273,7 @@ test:jupyter-cgmes: ...@@ -272,7 +273,7 @@ test:jupyter-cgmes:
- pytest -v Examples/Notebooks - pytest -v Examples/Notebooks
dependencies: dependencies:
- build:linux-cgmes - build:linux-cgmes
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-CGMES_2.4.15_16FEB2016 image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-cgmes
tags: tags:
- docker - docker
artifacts: artifacts:
...@@ -552,13 +553,13 @@ test:cuda 2/2: ...@@ -552,13 +553,13 @@ test:cuda 2/2:
generate:docs: generate:docs:
stage: generate stage: generate
needs: ["build:linux"] needs: ["build:linux-cgmes"]
script: script:
- make -j$(nproc) -C build docs - make -j$(nproc) -C build docs
- make -j$(nproc) -C build docs_cxx - make -j$(nproc) -C build docs_cxx
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-cgmes
dependencies: dependencies:
- build:linux - build:linux-cgmes
artifacts: artifacts:
paths: paths:
- build/docs/sphinx/html - build/docs/sphinx/html
...@@ -568,16 +569,16 @@ generate:docs: ...@@ -568,16 +569,16 @@ generate:docs:
generate:packages: generate:packages:
stage: generate stage: generate
needs: ["build:linux"] needs: ["build:linux-cgmes"]
script: script:
- make -j$(nproc) -C build package - make -j$(nproc) -C build package
only: only:
- tags - tags
tags: tags:
- docker - docker
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-cgmes
dependencies: dependencies:
- build:linux - build:linux-cgmes
artifacts: artifacts:
paths: paths:
- build/*.rpm - build/*.rpm
...@@ -623,9 +624,9 @@ pages: ...@@ -623,9 +624,9 @@ pages:
deploy:docker: deploy:docker:
stage: deploy stage: deploy
script: script:
- docker push ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} - docker push ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-cgmes
- docker push ${DOCKER_IMAGE_DEV}:latest - docker push ${DOCKER_IMAGE_DEV}:latest
- docker push ${DOCKER_IMAGE}:${DOCKER_TAG} - docker push ${DOCKER_IMAGE}:${DOCKER_TAG}-cgmes
- docker push ${DOCKER_IMAGE}:latest - docker push ${DOCKER_IMAGE}:latest
dependencies: dependencies:
- build:docker - build:docker
......
FROM fedora:32 FROM fedora:32
ARG VILLAS_VERSION=0.8.0 ARG VILLAS_VERSION=0.8.0
ARG CIM_VERSION=IEC61970_16v29a ARG CIM_VERSION=CGMES_2.4.15_16FEB2016
LABEL \ LABEL \
org.label-schema.schema-version = "1.0" \ org.label-schema.schema-version = "1.0" \
org.label-schema.name = "DPsim" \ org.label-schema.name = "DPsim" \
org.label-schema.license = "GPL-3.0" \ org.label-schema.license = "GPL-3.0" \
org.label-schema.vendor = "Institute for Automation of Complex Power Systems, RWTH Aachen University" \ org.label-schema.vendor = "Institute for Automation of Complex Power Systems, RWTH Aachen University" \
org.label-schema.author.name = "Steffen Vogel" \ org.label-schema.author.name = "Markus Mirz" \
org.label-schema.author.email = "stvogel@eonerc.rwth-aachen.de" \ org.label-schema.author.email = "mmirz@eonerc.rwth-aachen.de" \
org.label-schema.url = "http://fein-aachen.org/projects/dpsim/" \ org.label-schema.url = "http://fein-aachen.org/projects/dpsim/" \
org.label-schema.vcs-url = "https://git.rwth-aachen.de/acs/public/simulation/dpsim" org.label-schema.vcs-url = "https://git.rwth-aachen.de/acs/public/simulation/dpsim"
......
FROM centos:8 FROM centos:8
ARG VILLAS_VERSION=0.8.0 ARG VILLAS_VERSION=0.8.0
ARG CIM_VERSION=IEC61970_16v29a ARG CIM_VERSION=CGMES_2.4.15_16FEB2016
LABEL \ LABEL \
org.label-schema.schema-version = "1.0" \ org.label-schema.schema-version = "1.0" \
......
if(NOT CIM_VERSION) if(NOT CIM_VERSION)
set(CIM_VERSION "16v29a") set(CIM_VERSION "CGMES_2.4.15_16FEB2016")
endif() endif()
message(STATUS "CIM Version: ${CIM_VERSION}") message(STATUS "CIM Version: ${CIM_VERSION}")
......
# Workaround for cimpp on Windows and as submodule # Workaround for cimpp on Windows and as submodule
if(NOT CIM_VERSION) if(NOT CIM_VERSION)
set(CIM_VERSION "16v29a") set(CIM_VERSION "CGMES_2.4.15_16FEB2016")
endif() endif()
message(STATUS "CIM Version: ${CIM_VERSION}") message(STATUS "CIM Version: ${CIM_VERSION}")
......
Markdown is supported
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