Skip to content
Snippets Groups Projects
Commit 0ba92381 authored by Madeline Wade's avatar Madeline Wade
Browse files

Build from gstlal-ugly-* container rather than gstlal-* to get

all dependencies
parent 20ce5030
No related branches found
No related tags found
No related merge requests found
......@@ -35,7 +35,7 @@ stages:
build:
stage: build
interruptible: true
image: containers.ligo.org/lscsoft/gstlal:gstlal-1.10.0-v1
image: containers.ligo.org/lscsoft/gstlal:gstlal-ugly-1.10.0-v1
variables:
GIT_STRATEGY: fetch
RPM_BUILD_CPUS: 4
......@@ -62,7 +62,7 @@ build:
# Tests
test:
interruptible: true
image: containers.ligo.org/lscsoft/gstlal:gstlal-1.10.0-v1
image: containers.ligo.org/lscsoft/gstlal:gstlal-ugly-1.10.0-v1
stage: test
needs:
- build
......
FROM containers.ligo.org/lscsoft/gstlal:gstlal-1.10.0-v1
FROM containers.ligo.org/lscsoft/gstlal:gstlal-ugly-1.10.0-v1
# Labeling/packaging stuff:
LABEL name="GstLAL Calibration Runtime Package, RL8" \
......
......@@ -14,8 +14,6 @@ Requires: python3 >= @MIN_PYTHON_VERSION@
Requires: %{gstreamername} >= @MIN_GSTREAMER_VERSION@
Requires: %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@
Requires: %{gstreamername}-plugins-good >= @MIN_GSTREAMER_VERSION@
Requires: numpy
Requires: scipy
Requires: lal >= @MIN_LAL_VERSION@
Requires: lalmetaio >= @MIN_LALMETAIO_VERSION@
Requires: python%{python3_pkgversion}-%{gstreamername}
......@@ -24,9 +22,11 @@ Requires: python%{python3_pkgversion}-ligo-segments >= @MIN_LIGO_SEGMENTS_VERSIO
%if 0%{?rhel} == 8
Requires: python%{python3_pkgversion}-numpy >= @MIN_NUMPY_VERSION@
Requires: python3-matplotlib
Requires: python%{python3_pkgversion}-scipy
%else
Requires: numpy >= @MIN_NUMPY_VERSION@
Requires: python%{python3_pkgversion}-matplotlib
Requires: scipy
%endif
BuildRequires: pkgconfig >= @MIN_PKG_CONFIG_VERSION@
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment