From 51ffefca8bec3dd6478d35840708b480a6bfcf6d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: May 31 2018 13:46:22 +0000 Subject: treecompose: Pull assembler before running --- diff --git a/centos-ci/run-treecompose b/centos-ci/run-treecompose index ef34716..88a1acf 100755 --- a/centos-ci/run-treecompose +++ b/centos-ci/run-treecompose @@ -6,6 +6,7 @@ basedir=$(cd $(dirname $0) && pwd) vmajor=28 ref=fahc/${vmajor}/x86_64/buildmaster +assembler=quay.io/cgwalters/coreos-assembler for v in jigdo ostree; do rsync --delete --stats -a sig-atomic@artifacts.ci.centos.org::sig-atomic/${build}/${v}/ ${v}/ || mkdir -p ${v}/ @@ -61,8 +62,10 @@ if test -f ~/fedora-atomic-host-continuous/force-nocache.${rev:-}; then echo "Using --force-nocache for ${rev}" compose_extra_argv="--force-nocache" fi + +sudo docker pull ${assembler} run_assembler() { - sudo docker run --rm --privileged -v ${buildscriptsdir}:/srv/src -v ${WORKSPACE}:/srv/tmp -v $(cd ~ && pwd):/srv/home -v $(pwd):/srv/compose quay.io/cgwalters/coreos-assembler "$@" + sudo docker run --rm --privileged -v ${buildscriptsdir}:/srv/src -v ${WORKSPACE}:/srv/tmp -v $(cd ~ && pwd):/srv/home -v $(pwd):/srv/compose ${assembler} "$@" } mkdir -p cache run_assembler coreos-assembler --ex-jigdo-output-set /srv/compose/jigdo ${compose_extra_argv} --cachedir=/srv/compose/cache --touch-if-changed=/srv/tmp/changed.stamp --repo=/srv/compose/repo-build \