xci: Adjust and fix jobs and scripts

This change
- fixes GIT_BASE in jobs
- adjusts build blockers
- fixes where the flavor vars should be sourced from
- sources flavor vars for bifrost periodic jobs
- renames the xcimaster node to opnfv to be consistent
- removes obsolete xci-provision.sh script
- enable additional openstack services including tempest to
  ensure the deployment is sane

Change-Id: Ifdce1da52d68a26c2b87e1bd3b1996ec119d8d90
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

8 files changed, 32 insertions, 117 deletions

diff --git a/jjb/xci/bifrost-periodic-jobs.yml b/jjb/xci/bifrost-periodic-jobs.yml
index 31aa8dade..0c29fd3c9 100644
--- a/jjb/xci/bifrost-periodic-jobs.yml
+++ b/jjb/xci/bifrost-periodic-jobs.yml
@@ -77,8 +77,8 @@
                 - '^xci-os.*'
                 - '^xci-deploy.*'
                 - '^xci-functest.*'
-                - '^bifrost-periodic-.*'
-                - '^osa-periodic-.*'
+                - '^bifrost-.*periodic.*'
+                - '^osa-.*periodic.*'
             block-level: 'NODE'
         - logrotate-default
 
@@ -87,6 +87,9 @@
             project: '{project}'
             branch: '{opnfv-releng-version}'
         - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+        - string:
             name: XCI_FLAVOR
             default: 'ha'
         - string:
@@ -133,7 +136,7 @@
 
     builders:
         - description-setter:
-            description: "Built on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
+            description: "Built on $NODE_NAME - Flavor: $XCI_FLAVOR"
         - 'bifrost-provision-builder'
 
 #---------------------------
diff --git a/jjb/xci/bifrost-provision.sh b/jjb/xci/bifrost-provision.sh
index d8e17c463..4724c2ee5 100755
--- a/jjb/xci/bifrost-provision.sh
+++ b/jjb/xci/bifrost-provision.sh
@@ -70,6 +70,9 @@ cd /opt/releng && sudo git checkout --quiet $OPNFV_RELENG_VERSION
 echo "xci: using releng commit"
 git show --oneline -s --pretty=format:'%h - %s (%cr) <%an>'
 
+# source flavor vars
+source "$WORKSPACE/prototypes/xci/config/${XCI_FLAVOR}-vars"
+
 # combine opnfv and upstream scripts/playbooks
 sudo /bin/cp -rf /opt/releng/prototypes/bifrost/* /opt/bifrost/
 
@@ -77,7 +80,7 @@ sudo /bin/cp -rf /opt/releng/prototypes/bifrost/* /opt/bifrost/
 cd /opt/bifrost
 sudo -E ./scripts/destroy-env.sh
 
-# provision 6 VMs; xcimaster, controller00, controller01, controller02, compute00, and compute01
+# provision VMs for the flavor
 cd /opt/bifrost
 sudo -E ./scripts/bifrost-provision.sh
 
@@ -87,7 +90,6 @@ source env-vars
 ironic node-list
 virsh list
 
-
 echo "OpenStack nodes are provisioned!"
 # here we have to do something in order to capture what was the working sha1
 # hardcoding stuff for the timebeing
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index b93456ee2..80c816ca1 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -55,7 +55,7 @@
 - defaults:
     name: verify_vm_defaults
     test-vm-num-nodes: '3'
-    test-vm-node-names: 'xcimaster controller00 compute00'
+    test-vm-node-names: 'opnfv controller00 compute00'
     vm-domain-type: 'kvm'
     vm-cpu: '2'
     vm-disk: '30'
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index f9fbc1de8..12772c63d 100644
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -94,8 +94,8 @@
                 - '^xci-os.*'
                 - '^xci-deploy.*'
                 - '^xci-functest.*'
-                - '^bifrost-periodic-.*'
-                - '^osa-periodic-.*'
+                - '^bifrost-.*periodic.*'
+                - '^osa-.*periodic.*'
             block-level: 'NODE'
         - logrotate-default
 
@@ -155,10 +155,11 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
+                - '^xci-os.*'
                 - '^xci-deploy.*'
                 - '^xci-functest.*'
-                - '^bifrost-periodic-.*'
-                - '^osa-periodic-.*'
+                - '^bifrost-.*periodic.*'
+                - '^osa-.*periodic.*'
             block-level: 'NODE'
         - logrotate-default
 
@@ -173,6 +174,9 @@
             project: '{project}'
             branch: '{opnfv-releng-version}'
         - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+        - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
         - string:
diff --git a/jjb/xci/xci-provision.sh b/jjb/xci/xci-provision.sh
deleted file mode 100755
index 47a96767f..000000000
--- a/jjb/xci/xci-provision.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2016 Ericsson AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-set -o errexit
-set -o nounset
-set -o pipefail
-
-trap cleanup_and_upload EXIT
-
-function fix_ownership() {
-    if [ -z "${JOB_URL+x}" ]; then
-        echo "Not running as part of Jenkins. Handle the logs manually."
-    else
-        # Make sure cache exists
-        [[ ! -d ${HOME}/.cache ]] && mkdir ${HOME}/.cache
-
-        sudo chown -R jenkins:jenkins $WORKSPACE
-        sudo chown -R jenkins:jenkins ${HOME}/.cache
-    fi
-}
-
-function cleanup_and_upload() {
-    original_exit=$?
-    fix_ownership
-    exit $original_exit
-}
-
-# check distro to see if we support it
-if [[ ! "$DISTRO" =~ (xenial|centos7|suse) ]]; then
-    echo "Distro $DISTRO is not supported!"
-    exit 1
-fi
-
-# remove previously cloned repos
-sudo /bin/rm -rf /opt/bifrost /opt/openstack-ansible /opt/releng /opt/functest
-
-# Fix up permissions
-fix_ownership
-
-# ensure the versions to checkout are set
-export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-master}
-export OPNFV_RELENG_VERSION=${OPNFV_RELENG_VERSION:-master}
-
-# log some info
-echo -e "\n"
-echo "***********************************************************************"
-echo "*                                                                     *"
-echo "*                      Provision OpenStack Nodes                      *"
-echo "*                                                                     *"
-echo "                       bifrost version: $OPENSTACK_BIFROST_VERSION"
-echo "                       releng version: $OPNFV_RELENG_VERSION"
-echo "*                                                                     *"
-echo "***********************************************************************"
-echo -e "\n"
-
-# clone the repos and checkout the versions
-sudo git clone --quiet https://git.openstack.org/openstack/bifrost /opt/bifrost
-cd /opt/bifrost && sudo git checkout --quiet $OPENSTACK_BIFROST_VERSION
-echo "xci: using bifrost commit"
-git show --oneline -s --pretty=format:'%h - %s (%cr) <%an>'
-
-sudo git clone --quiet https://gerrit.opnfv.org/gerrit/releng /opt/releng
-cd /opt/releng && sudo git checkout --quiet $OPNFV_RELENG_VERSION
-echo "xci: using releng commit"
-git show --oneline -s --pretty=format:'%h - %s (%cr) <%an>'
-
-# this script will be reused for promoting bifrost versions and using
-# promoted bifrost versions as part of xci daily.
-USE_PROMOTED_VERSIONS=${USE_PROMOTED_VERSIONS:-false}
-if [ $USE_PROMOTED_VERSIONS = "true" ]; then
-    echo "TBD: Will use the promoted versions of openstack/opnfv projects"
-fi
-
-# combine opnfv and upstream scripts/playbooks
-sudo /bin/cp -rf /opt/releng/prototypes/bifrost/* /opt/bifrost/
-
-# cleanup remnants of previous deployment
-cd /opt/bifrost
-sudo -E ./scripts/destroy-env.sh
-
-# provision 6 VMs; xcimaster, controller00, controller01, controller02, compute00, and compute01
-cd /opt/bifrost
-sudo -E ./scripts/bifrost-provision.sh
-
-# list the provisioned VMs
-cd /opt/bifrost
-source env-vars
-ironic node-list
-virsh list
-
-# log some info
-echo -e "\n"
-echo "***********************************************************************"
-echo "*                                                                     *"
-echo "*                 OpenStack nodes are provisioned!                    *"
-echo "*                                                                     *"
-echo "***********************************************************************"
-echo -e "\n"
diff --git a/prototypes/bifrost/scripts/bifrost-provision.sh b/prototypes/bifrost/scripts/bifrost-provision.sh
index 2814808f0..d3b28ee10 100755
--- a/prototypes/bifrost/scripts/bifrost-provision.sh
+++ b/prototypes/bifrost/scripts/bifrost-provision.sh
@@ -34,7 +34,7 @@ export BIFROST_INVENTORY_SOURCE=$BAREMETAL_DATA_FILE
 
 # Default settings for VMs
 export TEST_VM_NUM_NODES=${TEST_VM_NUM_NODES:-3}
-export TEST_VM_NODE_NAMES=${TEST_VM_NODE_NAMES:-"xcimaster controller00 compute00"}
+export TEST_VM_NODE_NAMES=${TEST_VM_NODE_NAMES:-"opnfv controller00 compute00"}
 export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm}
 export VM_CPU=${VM_CPU:-4}
 export VM_DISK=${VM_DISK:-100}
diff --git a/prototypes/xci/file/setup-openstack.yml b/prototypes/xci/file/setup-openstack.yml
index 48f156ad7..bd5d5cd93 100644
--- a/prototypes/xci/file/setup-openstack.yml
+++ b/prototypes/xci/file/setup-openstack.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2017, Rackspace US, Inc. and others
+# Copyright 2014, Rackspace US, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,5 +22,15 @@
 - include: os-horizon-install.yml
 - include: os-ceilometer-install.yml
 - include: os-aodh-install.yml
+- include: os-designate-install.yml
+#NOTE(stevelle) Ensure Gnocchi identities exist before Swift
+- include: os-gnocchi-install.yml
+  when:
+    - gnocchi_storage_driver is defined
+    - gnocchi_storage_driver == 'swift'
+  vars:
+    gnocchi_identity_only: True
 - include: os-swift-install.yml
+- include: os-gnocchi-install.yml
 - include: os-ironic-install.yml
+- include: os-tempest-install.yml
diff --git a/prototypes/xci/xci-deploy.sh b/prototypes/xci/xci-deploy.sh
index 7eb3ecdff..da5bb26cf 100755
--- a/prototypes/xci/xci-deploy.sh
+++ b/prototypes/xci/xci-deploy.sh
@@ -31,7 +31,7 @@ source $XCI_PATH/config/user-vars
 # source pinned versions
 source $XCI_PATH/config/pinned-versions
 # source flavor configuration
-source "$XCI_PATH/flavors/${XCI_FLAVOR}-vars"
+source "$XCI_PATH/config/${XCI_FLAVOR}-vars"
 # source xci configuration
 source $XCI_PATH/config/env-vars