summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcontrib/cirrus/setup_environment.sh7
-rwxr-xr-xhack/install_catatonit.sh33
2 files changed, 24 insertions, 16 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 3786054a7..90d28b7ac 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -20,6 +20,13 @@ die_unknown() {
}
msg "************************************************************"
+msg "FIXME: force-install catatonit 0.17.0 until CI images are updated"
+msg "************************************************************"
+# FIXME: this is just a temporary workaround to force-install
+# catatonit 0.17.0. Please remove once the images are updated.
+./hack/install_catatonit.sh --force
+
+msg "************************************************************"
msg "Setting up runtime environment"
msg "************************************************************"
show_env_vars
diff --git a/hack/install_catatonit.sh b/hack/install_catatonit.sh
index 0a02b75ab..a35e349f5 100755
--- a/hack/install_catatonit.sh
+++ b/hack/install_catatonit.sh
@@ -4,22 +4,23 @@ CATATONIT_PATH="${BASE_PATH}/catatonit"
CATATONIT_VERSION="v0.1.7"
set -e
-if [ -f $CATATONIT_PATH ]; then
+if [ -f $CATATONIT_PATH ] && [ -z "$1" ]; then
echo "skipping ... catatonit is already installed"
-else
- echo "installing catatonit to $CATATONIT_PATH"
- buildDir=$(mktemp -d)
- git clone https://github.com/openSUSE/catatonit.git $buildDir
+ exit 0
+fi
- pushd $buildDir
- echo `pwd`
- git reset --hard ${CATATONIT_VERSION}
- autoreconf -fi
- ./configure
- make
- install ${SELINUXOPT} -d -m 755 $BASE_PATH
- install ${SELINUXOPT} -m 755 catatonit $CATATONIT_PATH
- popd
+echo "installing catatonit to $CATATONIT_PATH"
+buildDir=$(mktemp -d)
+git clone https://github.com/openSUSE/catatonit.git $buildDir
- rm -rf $buildDir
-fi
+pushd $buildDir
+echo `pwd`
+git reset --hard ${CATATONIT_VERSION}
+autoreconf -fi
+./configure
+make
+install ${SELINUXOPT} -d -m 755 $BASE_PATH
+install ${SELINUXOPT} -m 755 catatonit $CATATONIT_PATH
+popd
+
+rm -rf $buildDir