From b2eab0d2afd217f5ed564ac690bec8215ec3e563 Mon Sep 17 00:00:00 2001 From: Krzysztof Jamrog Date: Mon, 16 Jul 2018 10:12:49 +0200 Subject: [PATCH 1/3] Python bindings tests stage --- .gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++++++ setup.py | 4 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47320bd4563..2743cde0c37 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -519,6 +519,41 @@ xrootd_docker_test: only: - schedules + +pyxrootd_dockerimage: + stage: build:dockerimage + tags: + - docker-image-build + script: + - "" + variables: + TO: gitlab-registry.cern.ch/dss/xrootd + DOCKER_FILE: xrootd-docker/Dockerfile-python.ci + dependencies: + - xrootd_docker_get + only: + - schedules + +pyxrootd_docker_test: + stage: test + script: + - docker pull gitlab-registry.cern.ch/dss/xrootd + - sudo ./xrootd-docker/start.sh -i gitlab-registry.cern.ch/dss/xrootd + - docker exec metaman sh -c "head -c 1000000 /dev/urandom > /tmp/smallfile" + - docker exec metaman sh -c "head -c 1000000 /dev/urandom > /tmp/smallcopy" + - docker exec metaman sh -c "head -c 100000000 /dev/urandom > /tmp/bigfile" + - docker exec metaman sh -c "head -c 100000000 /dev/urandom > /tmp/bigcopy" + - docker exec metaman sh -c "cd xrootd/bindings/python && pytest" + + after_script: + - sudo ./xrootd-docker/clean.sh + tags: + - xrootd-shell + dependencies: + - xrootd_docker_get + only: + - schedules + publish:rhel: stage: publish image: gitlab-registry.cern.ch/linuxsupport/cc7-base diff --git a/setup.py b/setup.py index 60e678f6d09..277c92733b5 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, Extension from setuptools.command.install import install from setuptools.command.sdist import sdist -from setuptools.command.bdist_rpm import bdist_rpm +from distutils.command.bdist import bdist import subprocess import sys @@ -45,7 +45,7 @@ def run(self): sdist.run(self) -class CustomWheelGen(bdist_rpm): +class CustomWheelGen(bdist): # Do not generate wheel def run(self): return From f1be8d6d0735a892ebf959d736b360f646ec1d2c Mon Sep 17 00:00:00 2001 From: Krzysztof Jamrog Date: Mon, 16 Jul 2018 15:03:36 +0200 Subject: [PATCH 2/3] Moving pypi configuration scripts to packaging/wheel --- .gitlab-ci.yml | 1 + MANIFEST.in => packaging/wheel/MANIFEST.in | 0 install.sh => packaging/wheel/install.sh | 0 publish.sh => packaging/wheel/publish.sh | 0 setup.py => packaging/wheel/setup.py | 0 5 files changed, 1 insertion(+) rename MANIFEST.in => packaging/wheel/MANIFEST.in (100%) rename install.sh => packaging/wheel/install.sh (100%) rename publish.sh => packaging/wheel/publish.sh (100%) rename setup.py => packaging/wheel/setup.py (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2743cde0c37..62c39e88901 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -381,6 +381,7 @@ release:deb_ubuntu_xenial: release:pypi: stage: build:rpm script: + - cp packaging/wheel/* . - ./publish.sh tags: - xrootd-shell diff --git a/MANIFEST.in b/packaging/wheel/MANIFEST.in similarity index 100% rename from MANIFEST.in rename to packaging/wheel/MANIFEST.in diff --git a/install.sh b/packaging/wheel/install.sh similarity index 100% rename from install.sh rename to packaging/wheel/install.sh diff --git a/publish.sh b/packaging/wheel/publish.sh similarity index 100% rename from publish.sh rename to packaging/wheel/publish.sh diff --git a/setup.py b/packaging/wheel/setup.py similarity index 100% rename from setup.py rename to packaging/wheel/setup.py From 1755d00d329b1f55f61db4995e20bf7b6e8ae5b4 Mon Sep 17 00:00:00 2001 From: Krzysztof Jamrog Date: Mon, 16 Jul 2018 15:10:59 +0200 Subject: [PATCH 3/3] Allow failure and trigger change in pyxrootd tests --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 62c39e88901..374a9611643 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -533,7 +533,8 @@ pyxrootd_dockerimage: dependencies: - xrootd_docker_get only: - - schedules + - web + allow_failure: true pyxrootd_docker_test: stage: test @@ -553,7 +554,8 @@ pyxrootd_docker_test: dependencies: - xrootd_docker_get only: - - schedules + - web + allow_failure: true publish:rhel: stage: publish