From 625b75168acfaa30a1546524036d20e6a6e5e076 Mon Sep 17 00:00:00 2001 From: Tim Jammer <tim.jammer@tu-darmstadt.de> Date: Fri, 2 Aug 2024 10:35:20 +0200 Subject: [PATCH] Refactoring: renamed file --- .deactivated.gitlab-ci.yml | 134 ++++++++++++++++++------------------- MBI.py => MBB.py | 2 +- gitlab-simgrid.yml | 6 +- scripts/tools/aislinn.py | 2 +- scripts/tools/mpisv.py | 2 +- 5 files changed, 73 insertions(+), 73 deletions(-) rename MBI.py => MBB.py (99%) diff --git a/.deactivated.gitlab-ci.yml b/.deactivated.gitlab-ci.yml index c967c5c54..026c6c3fc 100755 --- a/.deactivated.gitlab-ci.yml +++ b/.deactivated.gitlab-ci.yml @@ -19,7 +19,7 @@ build-must: stage: build needs: [] script: - - scripts/ensure_python3 ./MBI.py -x must -c build + - scripts/ensure_python3 ./MBB.py -x must -c build artifacts: untracked: false paths: @@ -33,8 +33,8 @@ test-must-1: before_script: - apt-get install -y psmisc script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x must -c run -b 1/10 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x must -c run -b 1/10 artifacts: untracked: false when: always @@ -49,8 +49,8 @@ test-must-2: before_script: - apt-get install -y psmisc script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x must -c run -b 2/10 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x must -c run -b 2/10 artifacts: untracked: false when: always @@ -65,8 +65,8 @@ test-must-3: before_script: - apt-get install -y psmisc script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x must -c run -b 3/10 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x must -c run -b 3/10 artifacts: untracked: false when: always @@ -81,8 +81,8 @@ test-must-4: before_script: - apt-get install -y psmisc script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x must -c run -b 4/10 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x must -c run -b 4/10 artifacts: untracked: false when: always @@ -97,8 +97,8 @@ test-must-5: before_script: - apt-get install -y psmisc script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x must -c run -b 5/10 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x must -c run -b 5/10 artifacts: untracked: false when: always @@ -113,8 +113,8 @@ test-must-6: before_script: - apt-get install -y psmisc script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x must -c run -b 6/10 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x must -c run -b 6/10 artifacts: untracked: false when: always @@ -129,8 +129,8 @@ test-must-7: before_script: - apt-get install -y psmisc script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x must -c run -b 7/10 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x must -c run -b 7/10 artifacts: untracked: false when: always @@ -145,8 +145,8 @@ test-must-8: before_script: - apt-get install -y psmisc script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x must -c run -b 8/10 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x must -c run -b 8/10 artifacts: untracked: false when: always @@ -161,8 +161,8 @@ test-must-9: before_script: - apt-get install -y psmisc script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x must -c run -b 9/10 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x must -c run -b 9/10 artifacts: untracked: false when: always @@ -177,8 +177,8 @@ test-must-10: before_script: - apt-get install -y psmisc script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x must -c run -b 10/10 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x must -c run -b 10/10 artifacts: untracked: false when: always @@ -211,8 +211,8 @@ test-must-all: - job: test-must-10 artifacts: true script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x must + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x must artifacts: untracked: false when: always @@ -224,7 +224,7 @@ build-aislinn: needs: [] image: ubuntu:18.04 script: - - scripts/ensure_python3 ./MBI.py -x aislinn -c build + - scripts/ensure_python3 ./MBB.py -x aislinn -c build artifacts: untracked: false when: always @@ -238,8 +238,8 @@ test-aislinn: - job: build-aislinn artifacts: true script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x aislinn + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x aislinn artifacts: untracked: false when: always @@ -255,8 +255,8 @@ test-aislinn: # - baremetal # image: registry.hub.docker.com/mquinson/mbi # script: -# - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate -# - scripts/ensure_python3 ./MBI.py -x mpisv +# - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate +# - scripts/ensure_python3 ./MBB.py -x mpisv # artifacts: # untracked: false # when: always @@ -267,8 +267,8 @@ test-civl-1: stage: test needs: [] script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x civl -c run -b 1/4 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x civl -c run -b 1/4 artifacts: untracked: false when: always @@ -278,8 +278,8 @@ test-civl-2: stage: test needs: [] script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x civl -c run -b 2/4 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x civl -c run -b 2/4 artifacts: untracked: false when: always @@ -289,8 +289,8 @@ test-civl-3: stage: test needs: [] script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x civl -c run -b 3/4 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x civl -c run -b 3/4 artifacts: untracked: false when: always @@ -300,8 +300,8 @@ test-civl-4: stage: test needs: [] script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x civl -c run -b 4/4 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x civl -c run -b 4/4 artifacts: untracked: false when: always @@ -320,8 +320,8 @@ test-civl-all: - job: test-civl-4 artifacts: true script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x civl + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x civl artifacts: untracked: false when: always @@ -332,7 +332,7 @@ build-parcoach: stage: build needs: [] script: - - scripts/ensure_python3 ./MBI.py -x parcoach -c build + - scripts/ensure_python3 ./MBB.py -x parcoach -c build artifacts: untracked: false when: always @@ -345,8 +345,8 @@ test-parcoach: - job: build-parcoach artifacts: true script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x parcoach + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x parcoach artifacts: untracked: false when: always @@ -357,7 +357,7 @@ build-simgrid: stage: build needs: [] script: - - scripts/ensure_python3 ./MBI.py -x simgrid -c build + - scripts/ensure_python3 ./MBB.py -x simgrid -c build cache: paths: - SimGrid/* @@ -373,8 +373,8 @@ test-simgrid: - job: build-simgrid artifacts: true script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x simgrid + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x simgrid artifacts: untracked: false when: always @@ -386,8 +386,8 @@ test-smpi: - job: build-simgrid artifacts: true script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x smpi + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x smpi artifacts: untracked: false when: always @@ -399,8 +399,8 @@ test-smpivg-1: - job: build-simgrid artifacts: true script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x smpivg -b 1/3 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x smpivg -b 1/3 artifacts: untracked: false when: always @@ -412,8 +412,8 @@ test-smpivg-2: - job: build-simgrid artifacts: true script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x smpivg -b 2/3 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x smpivg -b 2/3 artifacts: untracked: false when: always @@ -425,8 +425,8 @@ test-smpivg-3: - job: build-simgrid artifacts: true script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x smpivg -b 3/3 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x smpivg -b 3/3 artifacts: untracked: false when: always @@ -442,8 +442,8 @@ test-smpivg-all: - job: test-smpivg-3 artifacts: true script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x smpivg + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x smpivg artifacts: untracked: false when: always @@ -457,8 +457,8 @@ test-smpivg-all: # - baremetal # image: registry.hub.docker.com/mquinson/mbi # script: -# - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate -# - scripts/ensure_python3 ./MBI.py -x itac -c run +# - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate +# - scripts/ensure_python3 ./MBB.py -x itac -c run # artifacts: # untracked: false # when: always @@ -469,7 +469,7 @@ build-isp: stage: build needs: [] script: - - scripts/ensure_python3 ./MBI.py -x isp -c build + - scripts/ensure_python3 ./MBB.py -x isp -c build artifacts: untracked: false when: always @@ -482,8 +482,8 @@ test-isp-1: - job: build-isp artifacts: true script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x isp -c run -b 1/2 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x isp -c run -b 1/2 artifacts: untracked: false when: always @@ -496,8 +496,8 @@ test-isp-2: - job: build-isp artifacts: true script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x isp -c run -b 2/2 + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x isp -c run -b 2/2 artifacts: untracked: false when: always @@ -512,8 +512,8 @@ test-isp-all: - job: test-isp-2 artifacts: true script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -x isp + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -x isp artifacts: untracked: false when: always @@ -526,8 +526,8 @@ latex: when: always script: - apt update ; apt -y install texlive-latex-base texlive-latex-extra texlive-pictures - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -c latex + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -c latex - cd script ; ./tools/gen_latex.py ; cd .. - cd latex ; pdflatex -batch dashboard.tex ; cd .. artifacts: @@ -540,8 +540,8 @@ pages: stage: deploy when: always script: - - rm -rf /MBI/*; scripts/ensure_python3 ./MBI.py -c generate - - scripts/ensure_python3 ./MBI.py -c html + - rm -rf /MBI/*; scripts/ensure_python3 ./MBB.py -c generate + - scripts/ensure_python3 ./MBB.py -c html - pwd ; ls - mkdir public - cp -r *.html gencodes img logs public/ diff --git a/MBI.py b/MBB.py similarity index 99% rename from MBI.py rename to MBB.py index f625111e1..3977cb11a 100755 --- a/MBI.py +++ b/MBB.py @@ -1,6 +1,6 @@ #! /usr/bin/python3 -# autopep8 -i --max-line-length 130 MBI.py +# autopep8 -i --max-line-length 130 MBB.py import shutil import os diff --git a/gitlab-simgrid.yml b/gitlab-simgrid.yml index 6d40ad739..3b4e500f2 100755 --- a/gitlab-simgrid.yml +++ b/gitlab-simgrid.yml @@ -15,9 +15,9 @@ pages: - 7zr x -so logs-*.7z | tar xf - - mkdir -p logs/simgrid - touch logs/simgrid/trust_the_installation trust_the_installation # Silence the checks for the right docker image - - python3 ./MBI.py -c generate -# - python3 ./MBI.py -x simgrid | grep Test - - python3 ./MBI.py -c html -x itac,simgrid,must,parcoach,isp,aislinn,mpisv,civl,smpi,smpivg + - python3 ./MBB.py -c generate +# - python3 ./MBB.py -x simgrid | grep Test + - python3 ./MBB.py -c html -x itac,simgrid,must,parcoach,isp,aislinn,mpisv,civl,smpi,smpivg - pwd ; ls ; echo logs:; ls logs - mkdir public - cp -r *.html gencodes img logs public/ diff --git a/scripts/tools/aislinn.py b/scripts/tools/aislinn.py index 5f45b992c..ae76700a8 100644 --- a/scripts/tools/aislinn.py +++ b/scripts/tools/aislinn.py @@ -16,7 +16,7 @@ class Tool(AbstractTool): print(f"id: '{id.stdout}'; version: '{ver.stdout}'") print("Please run this script in a ubuntu:18.04 image. Run these commands:") print(" docker image pull ubuntu:18.04") - print(" docker run -it --rm --name MIB --volume $(pwd):/MBI ubuntu:18.04 /MBI/MBI.py -x aislinn") + print(" docker run -it --rm --name MIB --volume $(pwd):/MBI ubuntu:18.04 /MBI/MBB.py -x aislinn") sys.exit(1) def build(self, rootdir, cached=True): diff --git a/scripts/tools/mpisv.py b/scripts/tools/mpisv.py index 5ace8ccf7..c00103e47 100644 --- a/scripts/tools/mpisv.py +++ b/scripts/tools/mpisv.py @@ -13,7 +13,7 @@ class Tool(AbstractTool): else: print("Please run this script in a mpisv/mpi-sv image. Run these commands:") print(" docker image pull mpisv/mpi-sv") - print(" docker run -it --rm --name MIB --shm-size=512m --volume $(pwd):/MBI mpisv/mpi-sv /MBI/scripts/ensure_python3 /MBI/MBI.py -x mpisv") + print(" docker run -it --rm --name MIB --shm-size=512m --volume $(pwd):/MBI mpisv/mpi-sv /MBI/scripts/ensure_python3 /MBI/MBB.py -x mpisv") sys.exit(1) def run(self, execcmd, filename, binary, id, timeout, batchinfo): -- GitLab