Ignore broken repo

diff --git a/install_master.sh b/install_master.sh
index 9ab588057dcfef7b1f39b982befccb9ef8dbb35d..780e9f4142ba9bfbc36acfc8d6bba8f0651f5c9f 100644 (file)
--- a/install_master.sh
+++ b/install_master.sh
@@ -5,7 +5,8 @@ THIS_DIR=`pwd`
 DATA_PATH=/root/os-ext-data
 
 # Steps to reinstall:
-# 1) Log in to mycloud.rackspace.com using credentials from os-ext-data/xenlibvirt-nodepool
+# 1) Log in to mycloud.rackspace.com using credentials from os-ext-data/single_node_ci_data.yaml
+#    Search for 'username' and 'password' under the 'oscc_file_contents' setting
 # 1a) Create new Ubuntu 14.04 server (copy password), hostname 'jenkins-libvirt'
 #     7.5GB Compute v1 flavor
 #     Enable monitoring and security updates
@@ -15,16 +16,24 @@ DATA_PATH=/root/os-ext-data
 # 2a) ssh-copy-id to copy a key to the server
 # 2b) edit /etc/sshd_config to set "PermitRootLogin without-password"
 # 2c) service ssh restart
-# 3) Copy the secret credentials dir (http://hg.uk.xensource.com/openstack/infrastructure.hg/os-ext-data) to /root
+# 3) Copy the secret credentials dir (http://hg.uk.xensource.com/openstack/infrastructure.hg/os-ext-data) to /root/os-ext-data
 # 4) Clone this repo:
 # 4a) apt-get install git
-# 4b) git clone https://github.com/citrix-openstack/os-ext-testing.git
-# 4c) cd os-ext-testing; git checkout common_ci
+# 4b) git clone https://github.com/bobball/os-ext-testing.git
+# 4c) cd os-ext-testing
 # 5) Run below commands (or just this script) to do the 'standard' install
 # 6) The jobs need an additional plugin in Jenkins to generate correctly, so:
 # 6a) Install Post-Build Script jenkins plugin (including restarting Jenkins)
 # 6b) Regenerate jenkins jobs: jenkins-jobs update --delete-old /etc/jenkins_jobs/config
-# ?) Set up monitoring checks https://intelligence.rackspace.com/cloud/entities/enWCIYVVnt
+# 7) Start processes
+# 7a) service zuul start; service zuul-merger start
+# 7b) Wait for a bit, check there are 3 zuul processes (1 merger, 2 servers)
+# 7c) service nodepool start
+# 7d) Wait for a bit (5m); check an image is being built (su - nodepool; nodepool image-list)
+# 7e) Wait for a lot (1h?); check a node is built (su - nodepool; nodepool list)
+# 7f) Check http://<ip> and http://<ip>:8080 to check that zuul + jenkins (respectively) are running
+# 8) Secure jenkins - instructions at end of http://docs.openstack.org/infra/openstackci/third_party_ci.html
+# ?) Set up monitoring checks https://intelligence.rackspace.com/
 
 # Copied from the following URL Feb 2016
 # http://docs.openstack.org/infra/openstackci/third_party_ci.html

diff --git a/nodepool/scripts/cache_git_repos.py b/nodepool/scripts/cache_git_repos.py
index bea36c932e6029425068c8611cc3e014d65bb8c5..e316259b85b1edacf81842a9c2aa6797cf000141 100755 (executable)
--- a/nodepool/scripts/cache_git_repos.py
+++ b/nodepool/scripts/cache_git_repos.py
@@ -61,6 +61,8 @@ def clone_repo(project):
                                       status=True,
                                       cwd=os.path.join('/opt/git', project))
         out = '\n'.join((out, moreout))
+        if status != 0 and project='openstack/solar-resources':
+            status = 0 
 
     # Status of 0 imples all the above worked, 1 means something failed.
     return (status, out)