Skip to content

Commit f96f9c9

Browse files
committed
Switch CircleCI test/test-cmake jobs to ubuntu 20.04 base image
1 parent b59c53f commit f96f9c9

File tree

1 file changed

+16
-53
lines changed

1 file changed

+16
-53
lines changed

.circleci/config.yml

Lines changed: 16 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,36 @@ version: 2.1
22
jobs:
33
test-cmake:
44
docker:
5-
- image: hysds/pge-base:latest
6-
user: root
5+
- image: ubuntu:20.04
76
steps:
87
- checkout:
98
path: /root/project/src
109

11-
- run:
12-
name: Install development tools
13-
command: |
14-
set -ex
15-
pwd
16-
yum update -y
17-
yum groupinstall -y "development tools"
18-
1910
- run:
2011
name: Install ISCE requirements
2112
command: |
2213
set -ex
2314
pwd
24-
mkdir config build install
25-
. /opt/conda/bin/activate root
26-
conda install -y cython gdal h5py libgdal pytest numpy fftw scipy scons hdf4 hdf5 libgcc libstdcxx-ng cmake astropy pybind11
27-
yum install -y libX11-devel motif-devel jq gcc-gfortran opencv-core
15+
export DEBIAN_FRONTEND=noninteractive
16+
apt-get update
17+
apt-get install -y cmake cython3 git libfftw3-dev libgdal-dev libhdf4-alt-dev libhdf5-dev libopencv-dev python3-gdal python3-h5py python3-numpy python3-scipy
2818
2919
- run:
3020
name: Build and Install ISCE
3121
command: |
3222
set -ex
3323
cd /root/project/src
34-
. /opt/conda/bin/activate root
3524
mkdir build
3625
cd build
37-
INSTALLPATH=/opt/conda
38-
MODPATH=$(python3 -c "import site; print(site.getsitepackages()[0])")
39-
# convert to relative path
40-
MODPATH=$(realpath --relative-to=$INSTALLPATH $MODPATH)
41-
cmake .. -DCMAKE_INSTALL_PREFIX=$INSTALLPATH -DPYTHON_MODULE_DIR=$MODPATH
26+
MODPATH=$(python3 -c "import site; print(site.getsitepackages()[-1])")
27+
cmake .. -DCMAKE_INSTALL_PREFIX=install -DPYTHON_MODULE_DIR=$MODPATH
4228
make install VERBOSE=y
4329
4430
- run:
4531
name: Test ISCE installation
4632
command: |
4733
set -ex
4834
cd /root/project/src/build
49-
. /opt/conda/bin/activate root
5035
ctest --output-on-failure
5136
ISCE2DIR=$(python3 -c "import os, isce2; print(os.path.dirname(isce2.__file__))" | tail -n 1)
5237
export PATH=$ISCE2DIR/applications:$PATH
@@ -60,37 +45,20 @@ jobs:
6045
6146
test:
6247
docker:
63-
- image: hysds/pge-base:latest
64-
user: root
48+
- image: ubuntu:20.04
6549
steps:
6650
- checkout:
6751
path: /root/project/src
6852

69-
- run:
70-
name: Install development tools
71-
command: |
72-
set -ex
73-
pwd
74-
yum update -y
75-
yum groupinstall -y "development tools"
76-
7753
- run:
7854
name: Install ISCE requirements
7955
command: |
8056
set -ex
8157
pwd
8258
mkdir config build install
83-
. /opt/conda/bin/activate root
84-
conda install --yes cython gdal h5py libgdal pytest numpy fftw scipy scons hdf4 hdf5 libgcc libstdcxx-ng cmake astropy pybind11
85-
yum install -y libuuid-devel libX11-devel motif-devel jq gcc-gfortran opencv-core
86-
ln -s /opt/conda/bin/cython /opt/conda/bin/cython3
87-
cd /opt/conda/lib
88-
unlink libuuid.so
89-
unlink libuuid.so.1
90-
ln -s /lib64/libuuid.so.1.3.0 libuuid.so
91-
ln -s /lib64/libuuid.so.1.3.0 libuuid.so.1
92-
cd /lib64
93-
test -f libgfortran.so || ln -sv libgfortran.so.*.* libgfortran.so
59+
export DEBIAN_FRONTEND=noninteractive
60+
apt-get update
61+
apt-get install -y scons cython3 git libfftw3-dev libgdal-dev libhdf4-alt-dev libhdf5-dev libmotif-dev libopencv-dev libx11-dev python3-gdal python3-h5py python3-numpy python3-scipy
9462
9563
- run:
9664
name: Build SConfigISCE and setup dirs
@@ -100,41 +68,36 @@ jobs:
10068
cd config
10169
echo "PRJ_SCONS_BUILD = /root/project/build" > SConfigISCE
10270
echo "PRJ_SCONS_INSTALL = /root/project/install/isce" >> SConfigISCE
103-
echo "LIBPATH = /usr/lib64 /usr/lib /opt/conda/lib" >> SConfigISCE
104-
python_inc="$(echo /opt/conda/include/python3.* /opt/conda/lib/python3.*/site-packages/numpy/core/include)"
105-
echo "CPPPATH = $python_inc /opt/conda/include /usr/include" >> SConfigISCE
106-
echo "FORTRANPATH = /usr/include /opt/conda/include" >> SConfigISCE
71+
echo "LIBPATH = /usr/lib64 /usr/lib /usr/lib/x86_64-linux-gnu" >> SConfigISCE
72+
python_inc="/usr/include/python3.8 /usr/lib/python3/dist-packages/numpy/core/include"
73+
echo "CPPPATH = $python_inc /usr/include /usr/include/gdal /usr/include/opencv4" >> SConfigISCE
74+
echo "FORTRANPATH = /usr/include" >> SConfigISCE
10775
echo "FORTRAN = /bin/gfortran" >> SConfigISCE
10876
echo "CC = /bin/gcc" >> SConfigISCE
10977
echo "CXX = /bin/g++" >> SConfigISCE
11078
echo "MOTIFLIBPATH = /usr/lib64" >> SConfigISCE
11179
echo "X11LIBPATH = /usr/lib64" >> SConfigISCE
11280
echo "MOTIFINCPATH = /usr/include" >> SConfigISCE
11381
echo "X11INCPATH = /usr/include" >> SConfigISCE
114-
echo "RPATH = /opt/conda/lib /usr/lib64 /usr/lib" >> SConfigISCE
82+
echo "RPATH = /usr/lib64 /usr/lib" >> SConfigISCE
11583
cat SConfigISCE
11684
11785
- run:
11886
name: Build and Install ISCE
11987
command: |
12088
set -ex
12189
pwd
122-
. /opt/conda/bin/activate root
12390
cd src
124-
export PATH="/opt/conda/bin:$PATH"
125-
export LD_LIBRARY_PATH="/opt/conda/lib:$LD_LIBRARY_PATH"
12691
SCONS_CONFIG_DIR=/root/project/config scons install --skipcheck
12792
12893
- run:
12994
name: Test ISCE installation
13095
command: |
13196
set -ex
13297
pwd
133-
. /opt/conda/bin/activate root
13498
ISCE_HOME=/root/project/install/isce
135-
export PATH="$ISCE_HOME/bin:$ISCE_HOME/applications:/opt/conda/bin:$PATH"
99+
export PATH="$ISCE_HOME/bin:$ISCE_HOME/applications:$PATH"
136100
export PYTHONPATH="/root/project/install:$PYTHONPATH"
137-
export LD_LIBRARY_PATH="/opt/conda/lib:$LD_LIBRARY_PATH"
138101
topsApp.py --help --steps
139102
stripmapApp.py --help --steps
140103
python3 -c "import isce"

0 commit comments

Comments
 (0)