Commit cddcad44 authored by Patrick Godwin's avatar Patrick Godwin
Browse files

gitlab-ci.yml: switch base containers to igwn:base, modify deps in build/test stages

parent 60c8c0ff
Pipeline #212983 passed with stages
in 2 minutes and 15 seconds
......@@ -32,7 +32,7 @@ dist:tarball:
build:el7:
<<: *build
image: igwn/software:el7
image: igwn/base:el7
dependencies:
- dist:tarball
before_script:
......@@ -41,10 +41,8 @@ build:el7:
rpm-build
epel-rpm-macros
python3-rpm-macros
python36
python36-setuptools
python36-six
python36-urllib3
python3-PyYAML
script:
- mkdir -pv dist/el7
- rpmbuild -tb dist/ligo-scald*.tar.gz
......@@ -70,16 +68,10 @@ build:el7:
dh-python
python3-all-dev
python3-setuptools
python3-six
python3-bottle
python3-numpy
python3-yaml
python3-h5py
python3-urllib3
help2man
script:
- pushd .
- version=$(python setup.py --version)
- version=$(python3 setup.py --version)
- cd dist
- tar -xf ligo-scald-${version}.tar.gz
- cd ligo-scald-${version}
......@@ -92,7 +84,7 @@ build:el7:
build:debian:buster:
<<: *build_debian
image: igwn/software:buster
image: igwn/base:buster
# -- test -------------------
......@@ -102,24 +94,31 @@ build:debian:buster:
dependencies:
- dist:tarball
variables:
PYTHON: python2
PYTHON: python
script:
- export SCALDRC_PATH=etc/example_config.yml
- ${PYTHON} -m pytest -v --cov=ligo.scald
- ${PYTHON} -m pytest -v --doctest-modules --cov=ligo/scald --ignore build/ --ignore dist/ --ignore doc/ --ignore setup.py
test:el7:
<<: *test
image: igwn/software:el7
image: igwn/base:el7
dependencies:
- build:el7
variables:
PYTHON: python3
before_script:
- yum -y remove python2-apipkg python36-apipkg
- yum -y install
python36-bottle
python36-dateutil
python36-future
python36-h5py
python36-numpy
python3-PyYAML
python36-six
python36-urllib3
python36-confluent-kafka
python36-pytest
python36-pytest-cov
- yum -y install python36-confluent-kafka
- yum -y --nogpgcheck localinstall dist/el7/python36-ligo-scald-*.rpm
cache:
key: "${CI_JOB_NAME}"
......@@ -128,7 +127,7 @@ test:el7:
test:debian:buster:
<<: *test
image: igwn/software:buster
image: igwn/base:buster
dependencies:
- build:debian:buster
variables:
......@@ -136,16 +135,16 @@ test:debian:buster:
before_script:
- apt-get update -y
- apt-get install -y
python3-pytest
python3-pytest-cov
python3-six
python3-bottle
python3-dateutil
python3-numpy
python3-yaml
python3-h5py
python3-ligo-common
python3-six
python3-urllib3
python3-confluent-kafka
python3-pytest
python3-pytest-cov
- dpkg -i dist/python3-ligo-scald_*_all.deb
cache:
key: "${CI_JOB_NAME}"
......
......@@ -2,13 +2,13 @@ Source: ligo-scald
Maintainer: Patrick Godwin <patrick.godwin@ligo.org>
Section: python
Priority: optional
Build-Depends: debhelper (>= 9), dh-python, python3-all-dev, python3-setuptools, python3-six, help2man
Build-Depends: debhelper (>= 9), dh-python, python3-all-dev, python3-setuptools, help2man
Standards-Version: 3.8.4
X-Python3-Version: >=3.6
Package: python3-ligo-scald
Architecture: all
Depends: ${misc:Depends}, ${python3:Depends}, python3-bottle, python3-dateutil, python3-numpy, python3-yaml, python3-h5py, python3-urllib3
Depends: ${misc:Depends}, ${python3:Depends}, python3-bottle, python3-dateutil, python3-numpy, python3-yaml, python3-h5py, python3-six, python3-urllib3
Provides: ${python3:Provides}
Description: SCalable Analytics for Ligo/virgo/kagra Data
ligo-scald is a gravitational-wave monitoring and dynamic data visualization
......
......@@ -3,13 +3,8 @@ include /usr/share/dpkg/pkg-info.mk
export PYBUILD_NAME := ligo-scald
# Redirect Python 3 packages to a directory that we are going to ignore.
# FIXME: in the future, we could put these in libexec or change their names.
export PYBUILD_INSTALL_ARGS_python3 := --install-scripts=/dont-install
export PYBUILD_AFTER_INSTALL_python3 := rm -rf {destdir}/dont-install
# Automatically generate man pages with help2man
export PYBUILD_AFTER_INSTALL_python2 := \
export PYBUILD_AFTER_INSTALL_python3 := \
echo 'Automatically generating man pages with help2man' && \
mkdir -p {destdir}/usr/share/man/man1 && \
ls {destdir}/usr/bin | env PYTHONPATH={destdir}{install_dir} \
......@@ -18,11 +13,7 @@ export PYBUILD_AFTER_INSTALL_python2 := \
{destdir}/usr/bin/@ -o {destdir}/usr/share/man/man1/@.1
%:
dh $@ --with python2,python3 --buildsystem=pybuild
dh $@ --with python3 --buildsystem=pybuild
override_dh_auto_test:
true
override_dh_python2:
dh_python2 --no-guessing-versions
%define name ligo-scald
%define version 0.7.2
%define unmangled_version 0.7.2
%define release 2
%define release 1
Summary: SCalable Analytics for Ligo/virgo/kagra Data
Name: %{name}
......@@ -18,12 +18,6 @@ BuildArch: noarch
BuildRequires: rpm-build
BuildRequires: epel-rpm-macros
BuildRequires: python-rpm-macros
# python2-ligo-scald
BuildRequires: python2-rpm-macros
BuildRequires: python2
BuildRequires: python2-setuptools
# python3-ligo-scald
BuildRequires: python3-rpm-macros
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment