From ab05372b46680807853002f12f36d19ef29271bf Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 28 Feb 2024 18:22:19 +0100 Subject: [PATCH] ci: Remove obsolete jobs from gitlab-ci.yml Signed-off-by: Steffen Vogel --- .gitlab-ci.yml | 326 +------------------------------------------------ 1 file changed, 6 insertions(+), 320 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54e4a431c0..36774d202b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,11 +2,8 @@ variables: GIT_STRATEGY: fetch GIT_SUBMODULE_STRATEGY: recursive - RSYNC_OPTS: --recursive --ignore-missing-args --chown ${DEPLOY_USER}:${DEPLOY_USER} - DOCKER_IMAGE: sogno/dpsim - DOCKER_IMAGE_DEV: sogno/dpsim-dev - DOCKER_IMAGE_DEV_ROCKY: sogno/dpsim-dev-rocky + DOCKER_IMAGE_DEV: sogno/dpsim-dev-rocky MAKE_OPTS: -j16 # for HYPER buildbots @@ -15,34 +12,6 @@ stages: - build - test - generate -# - deploy - -# moved to github actions -#.docker-fedora-template: &docker-fedora-template -# stage: prepare -# image: docker:20.10 -# needs: [] -# script: -# - docker build -# --build-arg MAKE_OPTS=${MAKE_OPTS} -# --file packaging/Docker/Dockerfile.dev -# ${TAGS} -# ${BUILD_ARGS} . -# tags: -# - docker -# -#docker:fedora-cgmes: -# <<: *docker-fedora-template -# variables: -# 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 - -# CGMES is the preferred CIM flavor -#docker:fedora-cim: -# <<: *docker-fedora-template -# variables: -# TAGS: --tag ${DOCKER_IMAGE_DEV}:${CI_COMMIT_REF_NAME}-cim -# BUILD_ARGS: --build-arg CIM_VERSION=IEC61970_16v29a docker:rocky: stage: prepare @@ -51,65 +20,14 @@ docker:rocky: - docker build . --build-arg MAKE_OPTS=${MAKE_OPTS} --file packaging/Docker/Dockerfile.dev-rocky - --tag ${DOCKER_IMAGE_DEV_ROCKY}:${CI_COMMIT_REF_NAME} + --tag ${DOCKER_IMAGE_DEV}:${CI_COMMIT_REF_NAME} tags: - docker -# moved to github actions -#build:linux-cgmes: -# stage: build -# needs: ["docker:fedora-cgmes"] -# script: -# - mkdir -p build -# - cd build -# - cmake -DCIM_VERSION=CGMES_2.4.15_16FEB2016 .. -# - make -j 32 -# image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-cgmes -# cache: -# artifacts: -# paths: -# - build -# tags: -# - docker - -# CGMES is the preferred CIM flavor -#build:linux-cim: -# stage: build -# needs: ["docker:fedora-cim"] -# script: -# - mkdir -p build -# - cd build -# - cmake -DCIM_VERSION=IEC61970_16v29a .. -# - make -j 32 -# image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-cim -# cache: -# paths: -# - build -# key: build-linux -# tags: -# - docker - -# moved to github actions -#build:linux-profiling: -# stage: build -# needs: ["docker:centos"] -# script: -# - mkdir -p build -# - cd build -# - cmake -DWITH_PROFILING=ON -DWITH_ASAN=ON -DWITH_CUDA=OFF -DFETCH_SPDLOG=ON .. -# - make -j 32 -# image: ${DOCKER_IMAGE_DEV}-centos:${DOCKER_TAG} -# cache: -# artifacts: -# paths: -# - build -# tags: -# - docker - build:linux-cuda: stage: build needs: ["docker:rocky"] - image: ${DOCKER_IMAGE_DEV_ROCKY}:${CI_COMMIT_REF_NAME} + image: ${DOCKER_IMAGE_DEV}:${CI_COMMIT_REF_NAME} artifacts: paths: - build @@ -122,162 +40,6 @@ build:linux-cuda: - make ${MAKE_OPTS} cache: -# moved to GitHub actions -#build:windows: -# stage: build -# needs: [] -# script: -# - New-Item -ItemType Directory -Force -Path build -# - Set-Location -Path build -# - cmake .. -# - cmake --build . -j 24 - -# moved to GitHub actions -#build:docker: -# stage: build -# needs: [] -# script: -# - docker build -# --file packaging/Docker/Dockerfile -# --build-arg DOCKER_TAG=${DOCKER_TAG} -# --build-arg MAKE_OPTS=${MAKE_OPTS} -# --tag ${DOCKER_IMAGE}:${DOCKER_TAG} -# --tag ${DOCKER_IMAGE}:latest . -# tags: -# - docker -# only: -# - tags - -#build:macos: -# stage: build -# script: -# - mkdir -p build -# - cd build -# - cmake -DCMAKE_C_COMPILER=/usr/local/bin/gcc-9 -# -DCMAKE_CXX_COMPILER=/usr/local/bin/g++-9 -# -DFETCH_CIMPP=ON -# -DWITH_SUNDIALS=OFF .. -# - make -j $(sysctl -n hw.ncpu) -# cache: -# paths: -# - build -# key: build-macos -# artifacts: -# paths: -# - build -# tags: -# - mac - -#test:pytest: -# stage: test -# variables: -# PYTHONPATH: "build/Source/Python:Source/Python" -# script: -# - pytest -v examples/CIM/test_CIM.yml -# image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} -# dependencies: -# - build:linux -# tags: -# - docker - -############################################################################## -# Stage test -############################################################################## - -# moved to GitHub actions -#test:jupyter-cgmes: -# stage: test -# needs: ["build:linux-cgmes"] -# variables: -# PYTHONPATH: "build:build/Source/Python:Source/Python" -# script: -# - pytest -v examples/Notebooks -# dependencies: -# - build:linux-cgmes -# image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-cgmes -# tags: -# - docker -# artifacts: -# paths: -# - outputs/examples/Notebooks/ -# -#test:cppcheck 1/2: -# stage: test -# needs: ["docker:centos"] -# script: -# - set -o pipefail -# - cppcheck --max-configs=32 -j 32 --error-exitcode=1 -q --std=c++11 -I Include/ -I models/Include/ Source/ examples/ models/Source/ | tee cppcheck-error.log -# image: ${DOCKER_IMAGE_DEV}-centos:${DOCKER_TAG} -# dependencies: -# - docker:centos -# tags: -# - docker -# artifacts: -# when: on_failure -# paths: -# - cppcheck-error.log -# expose_as: 'cppcheck-error' -# -#test:cppcheck 2/2: -# stage: test -# needs: ["docker:centos"] -# allow_failure: true -# script: -# - set -o pipefail -# - cppcheck --max-configs=32 -j 32 --error-exitcode=1 -q --enable=warning,performance,portability,information,missingInclude --std=c++11 -I Include/ -I models/Include/ Source/ examples/ models/Source/ | tee cppcheck-warn.log -# image: ${DOCKER_IMAGE_DEV}-centos:${DOCKER_TAG} -# dependencies: -# - docker:centos -# tags: -# - docker -# artifacts: -# when: on_failure -# paths: -# - cppcheck-warn.log -# expose_as: 'cppcheck-warn' -# -#.test-examples: -# stage: test -# needs: ["build:linux-profiling"] -# script: -# - $TEST_BINARY_PATH/$TEST_BINARY $TEST_PARAM 2>&1 | tee output.log -# - cat output.log | -# sed -n -E -e 's/^.*Average step time. ([0-9]+\.[0-9]+)$/step-time \1/p' | -# tee -a metrics.txt -# - gprof $TEST_BINARY_PATH/$TEST_BINARY | gprof2dot -s | dot -Tpng -o profiling.png || true -# image: ${DOCKER_IMAGE_DEV}-centos:${DOCKER_TAG} -# dependencies: -# - build:linux-profiling -# tags: -# - docker -# artifacts: -# reports: -# metrics: metrics.txt -# paths: -# - profiling.png -# expose_as: 'test-examples' -# -#test:examples 1/2: -# extends: .test-examples -# variables: -## Name of the test binary -# TEST_BINARY: 'WSCC_9bus_mult_decoupled' -## Path where the test binary is located -# TEST_BINARY_PATH: 'build/dpsim/examples/cxx' -## Command line parameters for the test binary -# TEST_PARAM: '' -# -#test:examples 2/2: -# extends: .test-examples -# variables: -## Name of the test binary -# TEST_BINARY: 'WSCC_9bus_mult_coupled' -## Path where the test binary is located -# TEST_BINARY_PATH: 'build/dpsim/examples/cxx' -## Command line parameters for the test binary -# TEST_PARAM: '' - - .benchmark-script: &benchmark-script | for ((copies=0;copies<=$TEST_NUM_COPIES;copies++)) do @@ -292,7 +54,7 @@ build:linux-cuda: stage: test script: - *benchmark-script - image: ${DOCKER_IMAGE_DEV_ROCKY}:${CI_COMMIT_REF_NAME} + image: ${DOCKER_IMAGE_DEV}:${CI_COMMIT_REF_NAME} tags: - docker @@ -318,7 +80,6 @@ test:solver-benchmark 1/2: - cpu-dense-metrics.txt expose_as: 'step-times-benchmark' - test:solver-benchmark 2/2: extends: .benchmark-step-times needs: ["build:linux-cuda"] @@ -392,7 +153,7 @@ test:solver-benchmark 2/2: after_script: - ssh $GPU_TARGET rm -rf $RDIR - ssh $GPU_TARGET pkill -fe -2 $RDIR/$TEST_BINARY - image: ${DOCKER_IMAGE_DEV_ROCKY}:${CI_COMMIT_REF_NAME} + image: ${DOCKER_IMAGE_DEV}:${CI_COMMIT_REF_NAME} tags: - docker @@ -467,52 +228,13 @@ test:cuda 3/3: - cuda-metrics.txt expose_as: 'step-times-benchmark' - -############################################################################## -# Stage generate -############################################################################## - -# moved to GitHub actions -#generate:docs: -# stage: generate -# needs: ["build:linux-cgmes"] -# script: -# - make ${MAKE_OPTS} -C build docs -# - make ${MAKE_OPTS} -C build docs_cxx -# image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-cgmes -# dependencies: -# - build:linux-cgmes -# artifacts: -# paths: -# - build/docs/sphinx/html -# - build/docs/doxygen/html -# tags: -# - docker -# -#generate:packages: -# stage: generate -# needs: ["build:linux-cgmes"] -# script: -# - make ${MAKE_OPTS} -C build package -# only: -# - tags -# tags: -# - docker -# image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-cgmes -# dependencies: -# - build:linux-cgmes -# artifacts: -# paths: -# - build/*.rpm -# - build/*.tar.gz - generate:metrics: stage: generate needs: ["test:solver-benchmark 1/2", "test:solver-benchmark 2/2"] script: - echo "set terminal svg size 800, 500; set output 'metrics.svg'; set title 'Speed of different Solver-Configurations'; set style data lines; set key outside; set xlabel \"Copies (WSCC-9bus Example)\"; set ylabel \"Average steptime (µs)\"; set xtics 1; set xtics nomirror; set ytics nomirror; set grid; plot \"cpu-dense-metrics.txt\" using (\$1 * 1000000) title \"Solving with CPU and dense matrices\", \"gpu-dense-metrics.txt\" using (\$1 * 1000000) title \"Solving with GPU and dense matrices\", \"cpu-sparse-metrics.txt\" using (\$1 * 1000000) title \"Solving with CPU and sparse matrices\"" > script.p - gnuplot script.p - image: ${DOCKER_IMAGE_DEV_ROCKY}:${CI_COMMIT_REF_NAME} + image: ${DOCKER_IMAGE_DEV}:${CI_COMMIT_REF_NAME} artifacts: reports: metrics: metrics.svg @@ -521,39 +243,3 @@ generate:metrics: expose_as: 'WSCC-9bus-benchmark' tags: - docker - - -############################################################################## -# Stage deploy -############################################################################## - -# moved to GitHub actions -#pages: -# stage: deploy -# needs: ["generate:docs"] -# script: -# - cp -r build/docs/sphinx/html/. public/sphinx -# - cp -r build/docs/doxygen/html/. public/doxygen -# artifacts: -# paths: -# - public -# dependencies: -# - generate:docs -# only: -# - deploy -# tags: -# - docker -# -#deploy:docker: -# stage: deploy -# script: -# - docker push ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}-cgmes -# - docker push ${DOCKER_IMAGE_DEV}:latest -# - docker push ${DOCKER_IMAGE}:${DOCKER_TAG}-cgmes -# - docker push ${DOCKER_IMAGE}:latest -# dependencies: -# - build:docker -# tags: -# - docker -# only: -# - tags