From ddd9c0cfec7e20542b54bd5336fa2d6cedb8293b Mon Sep 17 00:00:00 2001 From: Mykyta Karpin Date: Tue, 11 Apr 2017 16:04:06 +0300 Subject: [PATCH] Workaround removing of jenkins support Since commit [1] openstack-infra has dropped jenkins support because they don't use jenkins anymore. We are not ready to this change so need to workaround it. [1] https://github.com/openstack-infra/system-config/commit/ed3e133ff991272a76dcb344bd037de9f21923b8 Change-Id: I99ef36c98bb262092e9bce9fdd9fd726182d2067 Related-Bug: #1681836 --- murano-ci/nodepool/scripts/prepare_node.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/murano-ci/nodepool/scripts/prepare_node.sh b/murano-ci/nodepool/scripts/prepare_node.sh index 5e3933c0..6aabedd3 100755 --- a/murano-ci/nodepool/scripts/prepare_node.sh +++ b/murano-ci/nodepool/scripts/prepare_node.sh @@ -41,6 +41,11 @@ wget https://git.openstack.org/cgit/openstack-infra/system-config/plain/install_ sudo bash -xe install_puppet.sh sudo git clone --depth=1 git://git.openstack.org/openstack-infra/system-config.git /root/config + +# Upstream openstack-infra dropped support for jenkins, so we need to point to commit which still +# contains jenkins puppet manifests +sudo git --git-dir=/root/config/.git --work-tree=/root/config reset --hard 97787e3b3bf156d5b9949ca615983ccb79a6a78a + sudo /bin/bash /root/config/install_modules.sh #if [ -z "$NODEPOOL_SSH_KEY" ] ; then