If running git clean after reset then retry

* modules/jenkins/files/slave_scripts/gerrit-git-prep.sh
* .../openstack_project/files/jenkins_job_builder/config/macros.yaml
* .../infra-publications.yaml: If a git clean can not remove some
files, for example because a previous command has not freed its open
file handles, it will return nonzero. If this happens, wait a moment
and try again in case this is only a briefly transient problem.

Change-Id: If11320da7379c8fb8841b945067ce544188f5681

modules/jenkins/files/slave_scripts/gerrit-git-prep.sh

@@ -52,16 +52,25 @@ then
 fi
 
 git reset --hard
-git clean -x -f -d -q
+if ! git clean -x -f -d -q ; then
+    sleep 1
+    git clean -x -f -d -q
+fi
 
 if [ -z "$ZUUL_NEWREV" ]
 then
     git fetch $ZUUL_SITE/p/$ZUUL_PROJECT $ZUUL_REF
     git checkout FETCH_HEAD
     git reset --hard FETCH_HEAD
-    git clean -x -f -d -q
+    if ! git clean -x -f -d -q ; then
+        sleep 1
+        git clean -x -f -d -q
+    fi
 else
     git checkout $ZUUL_NEWREV
     git reset --hard $ZUUL_NEWREV
-    git clean -x -f -d -q
+    if ! git clean -x -f -d -q ; then
+        sleep 1
+        git clean -x -f -d -q
+    fi
 fi

modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml

@@ -26,7 +26,10 @@
       - shell: |
           #!/bin/bash -xe
           git reset --hard remotes/origin/master
-          git clean -x -f -d -q
+          if ! git clean -x -f -d -q ; then
+              sleep 1
+              git clean -x -f -d -q
+          fi
           ./make-index
 
     publishers:

modules/openstack_project/files/jenkins_job_builder/config/macros.yaml

@@ -188,10 +188,16 @@
               git remote set-url origin https://review.openstack.org/p/openstack-infra/devstack-gate
               git remote update
               git reset --hard
-              git clean -x -f
+              if ! git clean -x -f ; then
+                  sleep 1
+                  git clean -x -f
+              fi
               git checkout master
               git reset --hard remotes/origin/master
-              git clean -x -f
+              if ! git clean -x -f ; then
+                  sleep 1
+                  git clean -x -f
+              fi
               cd ..
           fi