From c623ee4c017c0df46a6a90d9a10d65d925fbd870 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 12:24:08 +0100 Subject: [PATCH 01/18] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f1cd7161..5f504abf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { sh 'docker rmi -f bscwdc/dislib &> /dev/null || true' sh 'docker build --pull --no-cache --tag bscwdc/dislib .' sh '''#!/bin/bash - docker run $(bash <(curl -s https://codecov.io/env)) -d --name dislib bscwdc/dislib''' + docker run $(bash <(curl -s https://codecov.io/env)) -v ~/.ssh:/home/compss/.shh -d --name dislib bscwdc/dislib''' } } stage('test') { From 02dd28e7ccfc8b6a76b730970b00200aa192c482 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 12:25:12 +0100 Subject: [PATCH 02/18] Update run_ci_checks.sh --- run_ci_checks.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/run_ci_checks.sh b/run_ci_checks.sh index 48680b1b..cffa6b02 100755 --- a/run_ci_checks.sh +++ b/run_ci_checks.sh @@ -7,6 +7,9 @@ cd ${root_path} # Add dislib to the python path export PYTHONPATH=$PYTHONPATH:${root_path} +ssh compss@mt1.bsc.es pwd +exit + echo "Running flake8 style check" ./run_style.sh From 7338193b549ffdc44ff1e0ead950ffa79f76ed52 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 12:28:01 +0100 Subject: [PATCH 03/18] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5f504abf..71e34bf6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { sh 'docker rmi -f bscwdc/dislib &> /dev/null || true' sh 'docker build --pull --no-cache --tag bscwdc/dislib .' sh '''#!/bin/bash - docker run $(bash <(curl -s https://codecov.io/env)) -v ~/.ssh:/home/compss/.shh -d --name dislib bscwdc/dislib''' + docker run $(bash <(curl -s https://codecov.io/env)) -v ~/.ssh:/home/jenkins/.shh -d --name dislib bscwdc/dislib''' } } stage('test') { From b00d54d7bbcf319f122c150f61b74697e82f26f4 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 12:28:24 +0100 Subject: [PATCH 04/18] Update run_ci_checks.sh --- run_ci_checks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_ci_checks.sh b/run_ci_checks.sh index cffa6b02..52c78ac5 100755 --- a/run_ci_checks.sh +++ b/run_ci_checks.sh @@ -7,7 +7,7 @@ cd ${root_path} # Add dislib to the python path export PYTHONPATH=$PYTHONPATH:${root_path} -ssh compss@mt1.bsc.es pwd +ssh jenkins@mt1.bsc.es pwd exit echo "Running flake8 style check" From fbf43922cab27730013c54687bfc273b4d67aadf Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 12:55:01 +0100 Subject: [PATCH 05/18] Update run_ci_checks.sh --- run_ci_checks.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/run_ci_checks.sh b/run_ci_checks.sh index 52c78ac5..7a7a14f3 100755 --- a/run_ci_checks.sh +++ b/run_ci_checks.sh @@ -7,7 +7,10 @@ cd ${root_path} # Add dislib to the python path export PYTHONPATH=$PYTHONPATH:${root_path} -ssh jenkins@mt1.bsc.es pwd +cat ~/.ssh/id_rsa.pub +cat ~/.ssh/authorized_keys + +#ssh jenkins@mt1.bsc.es pwd exit echo "Running flake8 style check" From 20176083f63d768db2ce59dc6ad15386469fb828 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 14:24:44 +0100 Subject: [PATCH 06/18] Update run_ci_checks.sh --- run_ci_checks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_ci_checks.sh b/run_ci_checks.sh index 7a7a14f3..f80608e8 100755 --- a/run_ci_checks.sh +++ b/run_ci_checks.sh @@ -10,7 +10,7 @@ export PYTHONPATH=$PYTHONPATH:${root_path} cat ~/.ssh/id_rsa.pub cat ~/.ssh/authorized_keys -#ssh jenkins@mt1.bsc.es pwd +ssh mt1.bsc.es pwd exit echo "Running flake8 style check" From 212947aba6272dfe2f839da5616972d47461c770 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 14:29:05 +0100 Subject: [PATCH 07/18] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 71e34bf6..f4fa5fd0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { sh 'docker rmi -f bscwdc/dislib &> /dev/null || true' sh 'docker build --pull --no-cache --tag bscwdc/dislib .' sh '''#!/bin/bash - docker run $(bash <(curl -s https://codecov.io/env)) -v ~/.ssh:/home/jenkins/.shh -d --name dislib bscwdc/dislib''' + docker run $(bash <(curl -s https://codecov.io/env)) -v /home/jenkins/.ssh:/home/jenkins/.shh -d --name dislib bscwdc/dislib''' } } stage('test') { From f33598890f22c8680dfc6975bb3496216ee18812 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 14:29:54 +0100 Subject: [PATCH 08/18] Update run_ci_checks.sh --- run_ci_checks.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/run_ci_checks.sh b/run_ci_checks.sh index f80608e8..832d48f2 100755 --- a/run_ci_checks.sh +++ b/run_ci_checks.sh @@ -7,10 +7,11 @@ cd ${root_path} # Add dislib to the python path export PYTHONPATH=$PYTHONPATH:${root_path} -cat ~/.ssh/id_rsa.pub -cat ~/.ssh/authorized_keys +echo $HOME +cat /home/jenkins/.ssh/id_rsa.pub +cat /home/jenkins/.ssh/authorized_keys -ssh mt1.bsc.es pwd +ssh compss@mt1.bsc.es pwd exit echo "Running flake8 style check" From b15770d06aa3377ffd557aaa1b0674d10d1130cc Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 14:36:55 +0100 Subject: [PATCH 09/18] Update Dockerfile --- Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2a30d0f4..1b7b2055 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,14 @@ -FROM bscwdc/dislib-base:latest +FROM compss/compss-tutorial:3.1 MAINTAINER COMPSs Support +USER jenkins + COPY . dislib/ -ENV PYTHONPATH=$PYTHONPATH:/dislib +ENV PYTHONPATH=$PYTHONPATH:/dislib:/opt/COMPSs/Bindings/python/3/ ENV LC_ALL=C.UTF-8 RUN python3 -m pip install --trusted-host pypi.org --trusted-host files.pythonhosted.org --upgrade -r /dislib/requirements.txt +RUN python3 -m pip install flake8 parameterized coverage ENV COMPSS_LOAD_SOURCE false From dee950f8d07a5b25969321e78ba5c692c0542eac Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 14:38:02 +0100 Subject: [PATCH 10/18] Update Dockerfile --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b7b2055..e3f5096e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,6 @@ FROM compss/compss-tutorial:3.1 MAINTAINER COMPSs Support -USER jenkins - COPY . dislib/ ENV PYTHONPATH=$PYTHONPATH:/dislib:/opt/COMPSs/Bindings/python/3/ From 6ac40ee6eac1c7a9ab91ab69b6b0ae479861bbf5 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 14:38:19 +0100 Subject: [PATCH 11/18] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f4fa5fd0..e392448a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { sh 'docker rmi -f bscwdc/dislib &> /dev/null || true' sh 'docker build --pull --no-cache --tag bscwdc/dislib .' sh '''#!/bin/bash - docker run $(bash <(curl -s https://codecov.io/env)) -v /home/jenkins/.ssh:/home/jenkins/.shh -d --name dislib bscwdc/dislib''' + docker run $(bash <(curl -s https://codecov.io/env)) -v /home/jenkins/.ssh:/home/root/.shh -d --name dislib bscwdc/dislib''' } } stage('test') { From de74fa1eda79e8e442a78f47f0f1bb9de4c3ba5d Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 14:40:40 +0100 Subject: [PATCH 12/18] Update run_ci_checks.sh --- run_ci_checks.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run_ci_checks.sh b/run_ci_checks.sh index 832d48f2..af324c4f 100755 --- a/run_ci_checks.sh +++ b/run_ci_checks.sh @@ -8,8 +8,8 @@ cd ${root_path} export PYTHONPATH=$PYTHONPATH:${root_path} echo $HOME -cat /home/jenkins/.ssh/id_rsa.pub -cat /home/jenkins/.ssh/authorized_keys +cat ~/.ssh/id_rsa.pub +cat ~/.ssh/authorized_keys ssh compss@mt1.bsc.es pwd exit From ddc4acb6842430e5f38efe2bec1f91728b344cc9 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 14:44:26 +0100 Subject: [PATCH 13/18] Update Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index e3f5096e..8ea7fcb6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,8 @@ RUN python3 -m pip install flake8 parameterized coverage ENV COMPSS_LOAD_SOURCE false +RUN rm -r /home/root/.shh + # Expose SSH port and run SSHD EXPOSE 22 CMD ["/usr/sbin/sshd","-D"] From 5888330fc5e153f22b488db879763406e38b25b4 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 14:46:33 +0100 Subject: [PATCH 14/18] Update Dockerfile --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8ea7fcb6..e3f5096e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,6 @@ RUN python3 -m pip install flake8 parameterized coverage ENV COMPSS_LOAD_SOURCE false -RUN rm -r /home/root/.shh - # Expose SSH port and run SSHD EXPOSE 22 CMD ["/usr/sbin/sshd","-D"] From 7950fd6615f72c56857a41f2ed9c9a953835c772 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 15:50:52 +0100 Subject: [PATCH 15/18] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e392448a..998705af 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { sh 'docker rmi -f bscwdc/dislib &> /dev/null || true' sh 'docker build --pull --no-cache --tag bscwdc/dislib .' sh '''#!/bin/bash - docker run $(bash <(curl -s https://codecov.io/env)) -v /home/jenkins/.ssh:/home/root/.shh -d --name dislib bscwdc/dislib''' + docker run $(bash <(curl -s https://codecov.io/env)) -v /home/jenkins/.ssh:/root/.shh -d --name dislib bscwdc/dislib''' } } stage('test') { From f10ab93aa981c276c6b03c3355590245949e9a26 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 15:53:23 +0100 Subject: [PATCH 16/18] Update Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index e3f5096e..14c784b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,8 @@ RUN python3 -m pip install flake8 parameterized coverage ENV COMPSS_LOAD_SOURCE false +RUN rm -rf /root/.ssh + # Expose SSH port and run SSHD EXPOSE 22 CMD ["/usr/sbin/sshd","-D"] From 72ede7dd9564807e0b0f79fcb627db3949a25140 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 15:56:28 +0100 Subject: [PATCH 17/18] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 998705af..91d4c301 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { sh 'docker rmi -f bscwdc/dislib &> /dev/null || true' sh 'docker build --pull --no-cache --tag bscwdc/dislib .' sh '''#!/bin/bash - docker run $(bash <(curl -s https://codecov.io/env)) -v /home/jenkins/.ssh:/root/.shh -d --name dislib bscwdc/dislib''' + docker run $(bash <(curl -s https://codecov.io/env)) -v /home/jenkins/.ssh:/root/.ssh:ro -d --name dislib bscwdc/dislib''' } } stage('test') { From c392ab388147b6f65e3869d906c88f4bdb2a5cf5 Mon Sep 17 00:00:00 2001 From: Cristian Tatu Date: Mon, 6 Mar 2023 15:59:18 +0100 Subject: [PATCH 18/18] Update Dockerfile --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 14c784b4..e3f5096e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,6 @@ RUN python3 -m pip install flake8 parameterized coverage ENV COMPSS_LOAD_SOURCE false -RUN rm -rf /root/.ssh - # Expose SSH port and run SSHD EXPOSE 22 CMD ["/usr/sbin/sshd","-D"]