nodepool,jenkins: Prepare OSCI upload at image creation

... so log upload of a build should fail less often.

diff --git a/jenkins/jobs/macros-common.yaml b/jenkins/jobs/macros-common.yaml
index 5f8c247c4f98ed69fef60b190a6a167cdb49d987..92ca55ca91693c87d1a02bac3adb0d6e46fdee19 100644 (file)
--- a/jenkins/jobs/macros-common.yaml
+++ b/jenkins/jobs/macros-common.yaml
@@ -100,18 +100,24 @@
       - shell: "/usr/local/jenkins/slave_scripts/grab_console_log.sh"
       - shell: |
           #!/bin/sh
-          virtualenv osci-env
-          . osci-env/bin/activate
-          git clone https://github.com/citrix-openstack/openstack-citrix-ci openstack-citrix-ci
-          # https://urllib3.readthedocs.org/en/latest/security.html#insecureplatformwarning
+          set -x
+          if [ -d ~/prepared-osci ]; then
+            . ~/prepared-osci/osci-env/bin/activate
+          else
+            virtualenv osci-env
+            . osci-env/bin/activate
+            git clone https://github.com/citrix-openstack/openstack-citrix-ci openstack-citrix-ci
+            # https://urllib3.readthedocs.org/en/latest/security.html#insecureplatformwarning
+            export PYTHONWARNINGS="ignore:A true SSLContext object is not"
+            echo export PYTHONWARNINGS="$PYTHONWARNINGS"
+            pip install -r openstack-citrix-ci/requirements.txt
+            pip install -e openstack-citrix-ci
+            # CA bundle in 2.5.2 is broken
+            pip install --upgrade requests>2.5.2
+            sudo mkdir -p /etc/osci/
+            sudo cp /opt/nodepool-scripts/osci.config /etc/osci/osci.config
+          fi
           export PYTHONWARNINGS="ignore:A true SSLContext object is not"
-          echo export PYTHONWARNINGS="$PYTHONWARNINGS"
-          pip install -r openstack-citrix-ci/requirements.txt
-          pip install -e openstack-citrix-ci
-          # CA bundle in 2.5.2 is broken
-          pip install --upgrade requests>2.5.2
-          sudo mkdir -p /etc/osci/
-          sudo cp /opt/nodepool-scripts/osci.config /etc/osci/osci.config
           osci-upload /tmp/console.html {upload_source} $LOG_PATH
 
 

diff --git a/nodepool/scripts/prepare_node_devstack_xen.sh b/nodepool/scripts/prepare_node_devstack_xen.sh
index 0e05b75da8a46bf0285ea5161f4fdbc95a026d1e..0dd54c05e7eb9992f8b36aa185aab99384075a57 100755 (executable)
--- a/nodepool/scripts/prepare_node_devstack_xen.sh
+++ b/nodepool/scripts/prepare_node_devstack_xen.sh
@@ -55,5 +55,24 @@ sudo chmod 0600 /swapfile
 sudo mkswap /swapfile
 echo "/swapfile        none    swap    sw      0       0" | sudo tee -a /etc/fstab
 
+# Install osci-upload
+install_osci_upload(){
+  apt-get install -y libmysqlclient-dev libffi-dev libssl-dev
+  mkdir /home/jenkins/prepared-osci
+  (
+  cd /home/jenkins/prepared-osci
+  virtualenv osci-env
+  . osci-env/bin/activate
+  git clone https://github.com/citrix-openstack/openstack-citrix-ci openstack-citrix-ci
+  pip install -r openstack-citrix-ci/requirements.txt
+  pip install -e openstack-citrix-ci
+  mkdir -p /etc/osci/
+  cp /opt/nodepool-scripts/osci.config /etc/osci/osci.config
+  osci-upload --help
+  )
+}
+
+install_osci_upload
+
 sync
 sleep 5