summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Pena <jpena@redhat.com>2018-04-24 16:44:39 +0200
committerJavier Peña <jpena@redhat.com>2018-05-04 14:02:01 +0000
commitb1e5327eb28dbadb1c582f41dd4cfec09ddfa4d3 (patch)
treea8a9f516819f947c53cdb72461807436f42bc19d
parent11f888e0e1910d2164b60094995fca2e9fbefe4c (diff)
Prepare for DLRN modular build driver structure
Previously, the delorean_setup function modified DLRN's build_rpm.sh script to make sure that the built rpms would not be installed as part of the mock build in its chroot. Since [1], DLRN will change the way it builds packages to use a driver structure, and the build_rpm.sh script will no longer exist. On the flip side, the default mock driver gives an option to skip installation in the mock call, so we can simply use it. [1] - https://softwarefactory-project.io/r/12039 Change-Id: I278da2ddf15a0b23ab522e63ac58c93043c4816f
Notes
Notes (review): Verified+1: RDO Third Party CI <dmsimard+rdothirdparty@redhat.com> Code-Review+2: Sagi Shnaidman <sshnaidm@redhat.com> Code-Review+2: John Trowbridge <trown@redhat.com> Workflow+1: John Trowbridge <trown@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 08 May 2018 20:48:24 +0000 Reviewed-on: https://review.openstack.org/563993 Project: openstack-infra/tripleo-ci Branch: refs/heads/master
-rwxr-xr-xscripts/tripleo.sh11
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/tripleo.sh b/scripts/tripleo.sh
index 274085e..c0553f8 100755
--- a/scripts/tripleo.sh
+++ b/scripts/tripleo.sh
@@ -405,7 +405,7 @@ function delorean_setup {
405 sudo usermod -G mock -a $(id -nu) 405 sudo usermod -G mock -a $(id -nu)
406 406
407 mkdir -p $TRIPLEO_ROOT 407 mkdir -p $TRIPLEO_ROOT
408 [ -d $TRIPLEO_ROOT/delorean ] || git clone https://github.com/openstack-packages/delorean.git $TRIPLEO_ROOT/delorean 408 [ -d $TRIPLEO_ROOT/delorean ] || git clone https://github.com/softwarefactory-project/DLRN.git $TRIPLEO_ROOT/delorean
409 409
410 pushd $TRIPLEO_ROOT/delorean 410 pushd $TRIPLEO_ROOT/delorean
411 411
@@ -416,8 +416,13 @@ function delorean_setup {
416 sed -i -e "s%target=.*%target=centos%" projects.ini 416 sed -i -e "s%target=.*%target=centos%" projects.ini
417 417
418 # Remove the rpm install test to speed up delorean (our ci test will to this) 418 # Remove the rpm install test to speed up delorean (our ci test will to this)
419 # TODO: add an option for this in delorean 419 if [ -f scripts/build_rpm.sh ]; then
420 sed -i -e 's%--postinstall%%' scripts/build_rpm.sh 420 # DLRN < 0.8.0
421 sed -i -e 's%--postinstall%%' scripts/build_rpm.sh
422 else
423 # This is an option in DLRN since 0.8.0 for the mock build driver
424 sed -i -e 's/^#install_after_build=1.*/install_after_build=0/' projects.ini
425 fi
421 426
422 virtualenv venv 427 virtualenv venv
423 # NOTE(pabelanger): We need to update setuptools to the latest version for 428 # NOTE(pabelanger): We need to update setuptools to the latest version for