From 37584c52354eae95f2a3950c35fe4840fd9c1b73 Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Tue, 4 Jun 2019 21:22:22 +0100 Subject: [PATCH 1/7] re-enable kaniko cache --- maintainer/docker_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainer/docker_build.sh b/maintainer/docker_build.sh index 816a467..4d558ec 100755 --- a/maintainer/docker_build.sh +++ b/maintainer/docker_build.sh @@ -26,4 +26,4 @@ else dest=test/$job_name-$CI_COMMIT_SHA fi -cmd "/kaniko/executor --context $PWD --dockerfile Dockerfile-$docker_tag* --destination $CI_REGISTRY/$CI_PROJECT_PATH/$dest" +cmd "/kaniko/executor --context $PWD --dockerfile Dockerfile-$docker_tag* --destination $CI_REGISTRY/$CI_PROJECT_PATH/$dest --cache=true --cache-repo $CI_REGISTRY/$CI_PROJECT_PATH/cache" From dada00b61a5bfe5182941ec8919ac94b18e8c5ee Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Tue, 4 Jun 2019 21:26:45 +0100 Subject: [PATCH 2/7] enable minimal testing for exotic architectures --- .gitlab-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f7e7e8..54bd1d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,6 +50,12 @@ stages: variables: python_version: "3" + +.test_template_nobuild: + extends: .test_template + script: + - true + centos:7:build: extends: .build_template centos-python3:7:build: @@ -164,6 +170,16 @@ test/ubuntu-python3:18.04: extends: .test_py3_template test/ubuntu-python3:min_boost: extends: .test_py3_template +test/ubuntu:arm64: + extends: .test_template_nobuild +test/ubuntu:armhf: + extends: .test_template_nobuild +test/ubuntu:i386: + extends: .test_template +test/ubuntu:ppc64le: + extends: .test_template_nobuild +test/ubuntu:s390x: + extends: .test_template_nobuild centos:7: extends: .deploy_template From 82cc1714c174b2712e8271a3e01635b46805121d Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Tue, 4 Jun 2019 21:35:10 +0100 Subject: [PATCH 3/7] yaml syntax --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54bd1d5..6519307 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,7 @@ stages: .test_template_nobuild: extends: .test_template script: - - true + - "true" centos:7:build: extends: .build_template From 7fbf8c6c1e3d3ebecd8aed2ee07e3a23c90353ae Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Wed, 5 Jun 2019 09:32:54 +0100 Subject: [PATCH 4/7] Fix i386 test --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6519307..401e31d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -175,7 +175,7 @@ test/ubuntu:arm64: test/ubuntu:armhf: extends: .test_template_nobuild test/ubuntu:i386: - extends: .test_template + extends: .test_py3_template test/ubuntu:ppc64le: extends: .test_template_nobuild test/ubuntu:s390x: From 3d8fc32408f88e14017e07471794653e2ac2c140 Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Thu, 6 Jun 2019 13:47:35 +0100 Subject: [PATCH 5/7] Exclude /tmp from intel:15 image --- docker/intel/Dockerfile-15 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/intel/Dockerfile-15 b/docker/intel/Dockerfile-15 index 7eb6f71..97830a6 100644 --- a/docker/intel/Dockerfile-15 +++ b/docker/intel/Dockerfile-15 @@ -27,6 +27,8 @@ RUN cd /usr/local \ && curl -sL https://cmake.org/files/v3.10/cmake-3.10.3-Linux-x86_64.tar.gz | tar --strip-components=1 -xz \ && rm -r /usr/local/man +VOLUME /tmp + # Intel Compiler COPY intel-15.cfg /tmp/intel.cfg RUN cd /tmp \ @@ -37,7 +39,7 @@ RUN cd /tmp \ && cd \ && rm -r /tmp/intel \ && /opt/intel/ism/uninstall.sh --silent \ - && rm -f /tmp/intelremotemonfifo.* && touch /tmp/intelremotemonfifo.0 + && rm -f /tmp/intelremotemonfifo.* ENV CC=/opt/intel/bin/icc CXX=/opt/intel/bin/icpc PATH="/opt/intel/bin:${PATH}" LD_LIBRARY_PATH="/opt/intel/lib/intel64:${LD_LIBRARY_PATH}" From c25d0c06f0ef001f6ae050f1d1f67d864c084c31 Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Thu, 6 Jun 2019 14:03:21 +0100 Subject: [PATCH 6/7] Fedora 30 package name changes h5py is now only for Python 3 as python3-h5py. python2-pylint is now pylint. --- docker/centos/Dockerfile-next | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/centos/Dockerfile-next b/docker/centos/Dockerfile-next index 97e4beb..a1c1c03 100644 --- a/docker/centos/Dockerfile-next +++ b/docker/centos/Dockerfile-next @@ -6,11 +6,11 @@ RUN yum -y install \ openmpi-devel \ fftw-devel \ boost-devel boost-openmpi-devel \ - python numpy h5py\ + python numpy \ git \ python-pep8 \ python2-Cython \ - python2-pylint \ + pylint \ python2-enum \ python-devel \ hdf5-openmpi-devel \ From d1b6fb6ed89f1da2ec968d80ea5ca010e6042ede Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Wed, 25 Sep 2019 12:24:15 +0200 Subject: [PATCH 7/7] also clean the cache repo --- maintainer/docker_clean.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainer/docker_clean.sh b/maintainer/docker_clean.sh index afa5358..69b7f56 100755 --- a/maintainer/docker_clean.sh +++ b/maintainer/docker_clean.sh @@ -8,3 +8,8 @@ for repo_id in $(curl -Ls --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" https://$CI_SE curl -Ls --request DELETE --data 'name_regex=.+' --data 'older_than=7d' --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" "https://$CI_SERVER_HOST/api/v4/projects/$CI_PROJECT_ID/registry/repositories/$repo_id/tags" | jq done +# same for the cache repo +repo_id=$(curl -Ls --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" https://$CI_SERVER_HOST/api/v4/projects/$CI_PROJECT_ID/registry/repositories | jq -r '.[] | select(.name == "test/cuda") | [.id] | @tsv') +# delete all tags older than 30 days +curl -Ls --request DELETE --data 'name_regex=.+' --data 'older_than=30d' --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" "https://$CI_SERVER_HOST/api/v4/projects/$CI_PROJECT_ID/registry/repositories/$repo_id/tags" | jq +