Merge "kvmfornfv: Store the metadata for the artifacts built by daily jobs"

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 6ea73e1..9493cd8 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -17,23 +17,44 @@
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
-#        brahmaputra
+# CI POD's
+#--------------------------------
+#        colorado
 #--------------------------------
     pod:
-        - arm-pod1:
+        - baremetal:
+            slave-label: armband-baremetal
             installer: fuel
             <<: *colorado
-        - arm-pod2:
+        - virtual:
+            slave-label: armband-virtual
             installer: fuel
             <<: *colorado
 #--------------------------------
 #        master
 #--------------------------------
-    pod:
-        - arm-pod1:
+        - baremetal:
+            slave-label: armband-baremetal
             installer: fuel
             <<: *master
+        - virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            <<: *master
+#--------------------------------
+# NONE-CI POD's
+#--------------------------------
+#        colorado
+#--------------------------------
         - arm-pod2:
+            slave-label: arm-pod2
+            installer: fuel
+            <<: *colorado
+#--------------------------------
+#        master
+#--------------------------------
+        - arm-pod2:
+            slave-label: arm-pod2
             installer: fuel
             <<: *master
 #--------------------------------
@@ -89,7 +110,7 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults':
+        - '{slave-label}-defaults':
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
@@ -139,7 +160,7 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults':
+        - '{slave-label}-defaults':
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
@@ -190,56 +211,101 @@
 # trigger macros
 ########################
 # CI PODs
-#----------------------------------------------------------
-# Enea Armband POD 1 Triggers running against master branch
-#----------------------------------------------------------
+#-----------------------------------------------------------------
+# Enea Armband CI Baremetal Triggers running against master branch
+#-----------------------------------------------------------------
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod1-master-trigger'
+    name: 'armband-fuel-os-odl_l2-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * 1,4'
+        - timed: '0 3 * * 1'
 - trigger:
-    name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod1-master-trigger'
+    name: 'armband-fuel-os-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 15 * * 1,4'
+        - timed: '0 3 * * 2'
 - trigger:
-    name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod1-master-trigger'
+    name: 'armband-fuel-os-odl_l3-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * 2,5'
+        - timed: '0 3 * * 3'
 - trigger:
-    name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod1-master-trigger'
+    name: 'armband-fuel-os-odl_l2-bgpvpn-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 15 * * 2,5'
+        - timed: '0 3 * * 4'
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod1-master-trigger'
+    name: 'armband-fuel-os-odl_l2-nofeature-noha-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * 3,6'
+        - timed: '0 3 * * 5'
+#----------------------------------------------------------------------
+# Enea Armband CI Baremetal Triggers running against brahmaputra branch
+#----------------------------------------------------------------------
+- trigger:
+    name: 'armband-fuel-os-odl_l2-nofeature-ha-baremetal-colorado-trigger'
+    triggers:
+        - timed: '0 15 * * 1'
+- trigger:
+    name: 'armband-fuel-os-nosdn-nofeature-ha-baremetal-colorado-trigger'
+    triggers:
+        - timed: '0 15 * * 2'
+- trigger:
+    name: 'armband-fuel-os-odl_l3-nofeature-ha-baremetal-colorado-trigger'
+    triggers:
+        - timed: '0 15 * * 3'
+- trigger:
+    name: 'armband-fuel-os-odl_l2-bgpvpn-ha-baremetal-colorado-trigger'
+    triggers:
+        - timed: '0 15 * * 4'
+- trigger:
+    name: 'armband-fuel-os-odl_l2-nofeature-noha-baremetal-colorado-trigger'
+    triggers:
+        - timed: '0 15 * * 5'
 #---------------------------------------------------------------
-# Enea Armband POD 1 Triggers running against brahmaputra branch
+# Enea Armband CI Virtual Triggers running against master branch
 #---------------------------------------------------------------
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod1-colorado-trigger'
+    name: 'armband-fuel-os-odl_l2-nofeature-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'armband-fuel-os-nosdn-nofeature-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'armband-fuel-os-odl_l3-nofeature-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'armband-fuel-os-odl_l2-bgpvpn-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'armband-fuel-os-odl_l2-nofeature-noha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+#--------------------------------------------------------------------
+# Enea Armband CI Virtual Triggers running against brahmaputra branch
+#--------------------------------------------------------------------
+- trigger:
+    name: 'armband-fuel-os-odl_l2-nofeature-ha-virtual-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod1-colorado-trigger'
+    name: 'armband-fuel-os-nosdn-nofeature-ha-virtual-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod1-colorado-trigger'
+    name: 'armband-fuel-os-odl_l3-nofeature-ha-virtual-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod1-colorado-trigger'
+    name: 'armband-fuel-os-odl_l2-bgpvpn-ha-virtual-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod1-colorado-trigger'
+    name: 'armband-fuel-os-odl_l2-nofeature-noha-virtual-colorado-trigger'
     triggers:
         - timed: ''
 #----------------------------------------------------------
 # Enea Armband POD 2 Triggers running against master branch
 #----------------------------------------------------------
-# No triggers for master for now
 - trigger:
     name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod2-master-trigger'
     triggers:

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index 730f0d1..136aac8 100755 (executable)
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -121,7 +121,7 @@ export FUEL_MASTER_IP=10.20.0.2
 export TACKER_SCRIPT_URL="https://git.opnfv.org/cgit/fuel/plain/prototypes/sfc_tacker/poc.tacker-up.sh?h=${GIT_BRANCH#*/}"
 export CONTROLLER_NODE_IP=$(sshpass -pr00tme /usr/bin/ssh -o UserKnownHostsFile=/dev/null \
     -o StrictHostKeyChecking=no root@$FUEL_MASTER_IP 'fuel node list' | \
-    grep opendaylight | cut -d'|' -f5)
+    grep controller | head -1 | cut -d'|' -f5)
 
 # we can't do much if we do not have the controller IP
 if [[ ! "$CONTROLLER_NODE_IP" =~ "10.20.0" ]]; then
@@ -149,8 +149,6 @@ send "/bin/mkdir -p /root/sfc-poc && cd /root/sfc-poc\r"
 expect "# "
 send "git clone https://gerrit.opnfv.org/gerrit/fuel && cd fuel\r"
 expect "# "
-send "git fetch https://gerrit.opnfv.org/gerrit/fuel refs/changes/97/10597/2 && git checkout FETCH_HEAD\r"
-expect "# "
 send "/bin/bash /root/sfc-poc/fuel/prototypes/sfc_tacker/poc.tacker-up.sh\r"
 expect "# "
 send "exit\r"

diff --git a/jjb/infra/infra-daily-jobs.yml b/jjb/infra/infra-daily-jobs.yml
index 64c2fc0..a066e7d 100644 (file)
--- a/jjb/infra/infra-daily-jobs.yml
+++ b/jjb/infra/infra-daily-jobs.yml
@@ -96,6 +96,10 @@
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
 
+    publishers:
+        - email:
+            recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com zhang.jun3g@zte.com.cn
+
 - job-template:
     name: 'infra-{phase}-{pod}-daily-{stream}'
 
@@ -118,6 +122,9 @@
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-noha'
+        - string:
+            name: CLEAN_DIB_IMAGES
+            default: 'false'
 
     scm:
         - git-scm:
@@ -149,11 +156,11 @@
         - shell: |
             #!/bin/bash
 
-            sudo $WORKSPACE/jjb/infra/infra-provision.sh
+            echo "Not activated!"
 - builder:
     name: 'infra-smoketest-daily-builder'
     builders:
         - shell: |
             #!/bin/bash
 
-            sudo $WORKSPACE/jjb/infra/infra-provision.sh
+            echo "Not activated!"

diff --git a/jjb/infra/infra-provision.sh b/jjb/infra/infra-provision.sh
index 5ddbaf9..45ed3b9 100755 (executable)
--- a/jjb/infra/infra-provision.sh
+++ b/jjb/infra/infra-provision.sh
@@ -21,7 +21,7 @@ cp -R /opt/releng/prototypes/bifrost/* /opt/bifrost/
 
 # cleanup remnants of previous deployment
 cd /opt/bifrost
-./scripts/destroy_env.sh
+./scripts/destroy-env.sh
 
 # provision 3 VMs; jumphost, controller, and compute
 cd /opt/bifrost

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 59348e4..608ce43 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -150,6 +150,16 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+    name: 'armband-baremetal-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'armband-baremetal'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
     name: 'joid-baremetal-defaults'
     parameters:
@@ -201,6 +211,16 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+    name: 'armband-virtual-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'armband-virtual'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
     name: 'joid-virtual-defaults'
     parameters:

diff --git a/prototypes/bifrost/README.md b/prototypes/bifrost/README.md
index fffd1de..f50ffb2 100644 (file)
--- a/prototypes/bifrost/README.md
+++ b/prototypes/bifrost/README.md
@@ -24,7 +24,7 @@ Please follow that steps:
 5. Run destroy script if you need to cleanup previous environment::
 
     cd /opt/bifrost
-    ./scripts/destroy_env.sh
+    ./scripts/destroy-env.sh
 
 6. Run deployment script to spin up 3 vms with bifrost: jumphost, controller and compute::
 

diff --git a/prototypes/bifrost/scripts/destroy_env.sh b/prototypes/bifrost/scripts/destroy-env.sh
similarity index 89%
rename from prototypes/bifrost/scripts/destroy_env.sh
rename to prototypes/bifrost/scripts/destroy-env.sh
index 819048b..4dffee6 100755 (executable)
--- a/prototypes/bifrost/scripts/destroy_env.sh
+++ b/prototypes/bifrost/scripts/destroy-env.sh
@@ -26,9 +26,13 @@ echo "removing leases"
 echo "removing logs"
 rm -rf /var/log/libvirt/baremetal_logs/*.log
 
-# clean up images
-rm -rf /httpboot/*
-rm -rf /tftpboot/*
+# clean up dib images only if requested explicitly
+if [ $CLEAN_DIB_IMAGES = "true" ]; then
+    rm -rf /httpboot/*
+    rm -rf /tftpboot/*
+fi
+
+# remove VM disk images
 rm -rf /var/lib/libvirt/images/*.qcow2
 
 echo "restarting services"

diff --git a/prototypes/puppet-infracloud/README.md b/prototypes/puppet-infracloud/README.md
index f3bd672..dd9e7bb 100644 (file)
--- a/prototypes/puppet-infracloud/README.md
+++ b/prototypes/puppet-infracloud/README.md
@@ -11,7 +11,7 @@ Once all the hardware is provisioned, enter in controller and compute nodes and
 
 2. Copy hiera to the right place::
 
-    cp /opt/releng/prototypes/puppet-infracloud/hiera/common.yaml /var/lib/hiera/    
+    cp /opt/releng/prototypes/puppet-infracloud/hiera/common.yaml /var/lib/hiera
 
 3. Install modules::
 
@@ -21,7 +21,7 @@ Once all the hardware is provisioned, enter in controller and compute nodes and
 4. Apply the infracloud manifest::
 
     cd /opt/releng/prototypes/puppet-infracloud
-    puppet apply --manifests/site.pp --modulepath=/etc/puppet/modules:/opt/releng/prototypes/puppet-infracloud/modules
+    puppet apply manifests/site.pp --modulepath=/etc/puppet/modules:/opt/releng/prototypes/puppet-infracloud/modules
 
 5. Once you finish this operation on controller and compute nodes, you will have a functional OpenStack cloud.