diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2020-08-04 12:23:26 +0100 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2020-08-04 12:23:26 +0100 |
| commit | dc1dc11efeee852fa87e8ac4f0a451f2ad35afe9 (patch) | |
| tree | 8ccf44b23d0d5dee7d625c39589eaed9e33a40c9 /.gitlab-ci.yml | |
| parent | 2966ed608574097d6d795526051c40b00244fa72 (diff) | |
| download | libvirt-python-dc1dc11efeee852fa87e8ac4f0a451f2ad35afe9.tar.gz | |
ci: refresh dockerfiles for changed libvirt build system
Libvirt changed from autotools to meson. All the containers need
refreshing and the CI recipes updated.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7d08e5..de5300d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,18 +29,18 @@ stages: - export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)" - export SCRATCH_DIR="/tmp/scratch" - export VROOT="$SCRATCH_DIR/vroot" - - export LD_LIBRARY_PATH="$VROOT/lib" + - export LIBDIR="$VROOT/lib" + - export LD_LIBRARY_PATH="$LIBDIR" - export PATH="$VROOT/bin:$PATH" - - export PKG_CONFIG_PATH="$VROOT/lib/pkgconfig" + - export PKG_CONFIG_PATH="$LIBDIR/pkgconfig" script: - pushd "$PWD" - mkdir -p "$SCRATCH_DIR" - cd "$SCRATCH_DIR" - git clone --depth 1 https://gitlab.com/libvirt/libvirt.git - - mkdir libvirt/build - - cd libvirt/build - - ../autogen.sh --prefix="$VROOT" --without-libvirtd - - $MAKE install + - cd libvirt + - meson build -Ddriver_libvirtd=disabled "--prefix=$VROOT" "--libdir=$LIBDIR" + - ninja -C build install - popd - $PYTHON setup.py build - $PYTHON setup.py install @@ -83,10 +83,10 @@ centos-8-container: variables: NAME: centos-8 -debian-9-container: +centos-stream-container: <<: *container_job_definition variables: - NAME: debian-9 + NAME: centos-stream debian-10-container: <<: *container_job_definition @@ -146,10 +146,10 @@ centos-8-dist-build: variables: NAME: centos-8 -debian-9-dist-build: +centos-stream-dist-build: <<: *dist_build_job_definition variables: - NAME: debian-9 + NAME: centos-stream debian-10-dist-build: <<: *dist_build_job_definition |