From db84dff05cc6fec30d8c7dcbf65ec372e3ff4681 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 9 Oct 2013 09:26:31 -0400 Subject: [PATCH] Clean up in requirements job We don't run this job with a fully clean workspace (git clean in the requirements repo does not seem to also delete git repositories that have been cloned as subdirs) So we need to remove and re-clone. Also, while looking in to this, concurrent: false was missing. I'm pretty sure we don't want to run more than one of these. Change-Id: I09d1d07b815c348df5d9ae664b84dba9d5d169f0 --- .../jenkins/files/slave_scripts/propose_requirements_update.sh | 1 + .../files/jenkins_job_builder/config/requirements.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/jenkins/files/slave_scripts/propose_requirements_update.sh b/modules/jenkins/files/slave_scripts/propose_requirements_update.sh index 5769a71cdf..16da01f6ea 100755 --- a/modules/jenkins/files/slave_scripts/propose_requirements_update.sh +++ b/modules/jenkins/files/slave_scripts/propose_requirements_update.sh @@ -42,6 +42,7 @@ EOF set -e fi + rm -rf $(basename $PROJECT) git clone --depth=1 ssh://$USERNAME@review.openstack.org:29418/$PROJECT.git PROJECT_DIR=$(basename $PROJECT) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml index b04c085d37..1a847882df 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml @@ -26,6 +26,7 @@ - job: name: propose-requirements-updates node: proposal + concurrent: false builders: - gerrit-git-prep