From e90fa30841370d16f094690b70ff720b49af53fb Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Fri, 18 Oct 2019 12:13:02 -0400 Subject: [PATCH] revert part of #1469 After merging #1469, CI runs are failing on the merge step 11:33:39 fatal: proposed/devel-build-modulemd - not something we can merge This seems to be caused by the change to the fetch line. It seems older versions of git might have slightly different behavior when asked to fetch a branch name. --- .cico-pr.pipeline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cico-pr.pipeline b/.cico-pr.pipeline index 70da7aa1..14a7ec89 100644 --- a/.cico-pr.pipeline +++ b/.cico-pr.pipeline @@ -49,7 +49,7 @@ node('factory2'){ timeout(time: 10, unit: 'MINUTES') { onmyduffynode "GIT_TRACE=1 GIT_CURL_VERBOSE=1 git clone --single-branch https://pagure.io/fm-orchestrator.git" onmyduffynode "cd fm-orchestrator && git remote add proposed \"${env.REPO}\"" - onmyduffynode "cd fm-orchestrator && GIT_TRACE=1 GIT_CURL_VERBOSE=1 git fetch proposed \"${env.BRANCH}\"" + onmyduffynode "cd fm-orchestrator && GIT_TRACE=1 GIT_CURL_VERBOSE=1 git fetch proposed" onmyduffynode "cd fm-orchestrator && git checkout origin/master" onmyduffynode "cd fm-orchestrator && git config --global user.email ci@centos.org" onmyduffynode "cd fm-orchestrator && git config --global user.name CentOS CI"