Merge "armband: Deploy triggers yardstick tests for CI pods."

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index a8cfc04..664768c 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -228,46 +228,46 @@
 - trigger:
     name: 'armband-fuel-os-odl_l2-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * 1'
+        - timed: '0 3,15 * * 1'
 - trigger:
     name: 'armband-fuel-os-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * 2'
+        - timed: '0 3,15 * * 2'
 - trigger:
     name: 'armband-fuel-os-odl_l3-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * 3'
+        - timed: '0 3,15 * * 3'
 - trigger:
     name: 'armband-fuel-os-odl_l2-bgpvpn-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * 4'
+        - timed: '0 3,15 * * 4'
 - trigger:
     name: 'armband-fuel-os-odl_l2-nofeature-noha-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * 5'
+        - timed: '0 3,15 * * 5'
 #----------------------------------------------------------------------
 # Enea Armband CI Baremetal Triggers running against colorado branch
 #----------------------------------------------------------------------
 - trigger:
     name: 'armband-fuel-os-odl_l2-nofeature-ha-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 15 * * 1'
+        - timed: '0 4,16 * * 1'
 - trigger:
     name: 'armband-fuel-os-nosdn-nofeature-ha-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 15 * * 2'
+        - timed: '0 4,16 * * 2'
 - trigger:
     name: 'armband-fuel-os-odl_l3-nofeature-ha-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 15 * * 3'
+        - timed: '0 4,16 * * 3'
 - trigger:
     name: 'armband-fuel-os-odl_l2-bgpvpn-ha-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 15 * * 4'
+        - timed: '0 4,16 * * 4'
 - trigger:
     name: 'armband-fuel-os-odl_l2-nofeature-noha-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 15 * * 5'
+        - timed: '0 4,16 * * 5'
 #---------------------------------------------------------------
 # Enea Armband CI Virtual Triggers running against master branch
 #---------------------------------------------------------------

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 3925450..0f0caba 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -96,6 +96,23 @@
             slave-label: '{pod}'
             installer: apex
             <<: *colorado
+# armband CI PODs
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            <<: *master
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            <<: *master
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            <<: *colorado
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            <<: *colorado
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -119,7 +136,7 @@
             slave-label: '{pod}'
             installer: apex
             <<: *master
-        - arm-pod1:
+        - arm-pod2:
             slave-label: '{pod}'
             installer: fuel
             <<: *master
@@ -143,7 +160,7 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *colorado
-        - arm-pod1:
+        - arm-pod2:
             slave-label: '{pod}'
             installer: fuel
             <<: *colorado
@@ -342,4 +359,4 @@
     name: functest-exit
     builders:
         - shell:
-            !include-raw: ./functest-exit.sh
\ No newline at end of file
+            !include-raw: ./functest-exit.sh

diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh
index 860eee0..07198c6 100644 (file)
--- a/jjb/opnfv/opnfv-docker.sh
+++ b/jjb/opnfv/opnfv-docker.sh
@@ -110,7 +110,12 @@ echo "Tag version to be build and pushed: $DOCKER_TAG"
 # Start the build
 echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG"
 
-docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG --build-arg BRANCH=$branch .
+if [[ $DOCKER_REPO_NAME == *"functest"* ]]; then
+    docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG --build-arg BRANCH=$branch .
+else
+    docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG .
+fi
+
 echo "Creating tag '$DOCKER_TAG'..."
 docker tag -f $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG $DOCKER_REPO_NAME:$DOCKER_TAG
 

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 0c8435d..c7ec6aa 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -603,24 +603,6 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
-- parameter:
-    name: 'arm-pod1-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - arm-pod1
-            default-slaves:
-                - arm-pod1
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: LAB_CONFIG_URL
-            default: ssh://git@git.enea.com/pharos/lab-config
-            description: 'Base URI to the configuration directory'
 - parameter:
     name: 'arm-pod2-defaults'
     parameters:

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index eb4ee52..2aa775f 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -209,12 +209,10 @@
             mv docs_output "$local_path"
             gsutil -m cp -r "$local_path" "gs://$gs_base"
 
-            if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
-                gsutil -m setmeta \
-                    -h "Content-Type:text/html" \
-                    -h "Cache-Control:private, max-age=0, no-transform" \
-                    "gs://$gs_path"/**.html
-            fi
+            gsutil -m setmeta \
+                -h "Content-Type:text/html" \
+                -h "Cache-Control:private, max-age=0, no-transform" \
+                "gs://$gs_path"/**.html > /dev/null 2>&1
 
             echo "Document link(s):" >> gerrit_comment.txt
             find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \
@@ -245,12 +243,10 @@
             mv docs_output "$local_path"
             gsutil -m cp -r "$local_path" "gs://$GS_URL"
 
-            if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
-                gsutil -m setmeta \
-                    -h "Content-Type:text/html" \
-                    -h "Cache-Control:private, max-age=0, no-transform" \
-                    "gs://$gs_path"/**.html
-            fi
+            gsutil -m setmeta \
+                -h "Content-Type:text/html" \
+                -h "Cache-Control:private, max-age=0, no-transform" \
+                "gs://$gs_path"/**.html > /dev/null 2>&1
 
             echo "Document link(s):" >> gerrit_comment.txt
             find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \

diff --git a/prototypes/puppet-infracloud/README.md b/prototypes/puppet-infracloud/README.md
index dd9e7bb..37d575c 100644 (file)
--- a/prototypes/puppet-infracloud/README.md
+++ b/prototypes/puppet-infracloud/README.md
@@ -31,7 +31,7 @@ In jumphost, follow that steps:
 
     git clone https://gerrit.opnfv.org/gerrit/releng /opt/releng
 
-2. Create OpenStack clouds config directory:
+2. Create OpenStack clouds config directory::
 
     mkdir -p /root/.config/openstack
 
@@ -39,14 +39,23 @@ In jumphost, follow that steps:
 
     cp /opt/releng/prototypes/puppet-infracloud/creds/clouds.yaml /root/.config/openstack/
 
-4. Install openstack-client:
+4. Install python-dev package as the installation of python-openstackclient depends on it
+
+    apt-get install -y python-dev
+
+5. Install openstack-client. (version 3.2.0 is known to work)::
 
     pip install python-openstackclient
 
-5. Export the desired cloud::
+6. Update /etc/hosts and add controller00::
+
+    192.168.122.3 controller00
+    192.168.122.3 controller00.opnfvlocal controller00
+
+7. Export the desired cloud::
 
     export OS_CLOUD=opnfv
 
-6. Start using it::
+8. Start using it::
 
-    openstack server list
+    openstack service list