From afff1f88a918215eeb9060c4f43c5a332c8eb32c Mon Sep 17 00:00:00 2001
From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Wed, 16 May 2018 16:23:56 -0700
Subject: Rename files under jjb from 'yml' to 'yaml'

global-jjb only supports the .yaml file ending for jjb jobs. Instead of
waiting for a release we're going to rename the files.

Change-Id: Icf3339eacd2320c583333e02250998cf6b1881f7
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---
 jjb/xci/bifrost-cleanup-job.yaml   | 146 ++++++++++++
 jjb/xci/bifrost-cleanup-job.yml    | 146 ------------
 jjb/xci/bifrost-periodic-jobs.yaml | 152 ++++++++++++
 jjb/xci/bifrost-periodic-jobs.yml  | 152 ------------
 jjb/xci/bifrost-verify-jobs.yaml   | 217 +++++++++++++++++
 jjb/xci/bifrost-verify-jobs.yml    | 217 -----------------
 jjb/xci/osa-periodic-jobs.yaml     | 261 ++++++++++++++++++++
 jjb/xci/osa-periodic-jobs.yml      | 261 --------------------
 jjb/xci/xci-daily-jobs.yaml        | 265 +++++++++++++++++++++
 jjb/xci/xci-daily-jobs.yml         | 265 ---------------------
 jjb/xci/xci-merge-jobs.yaml        | 470 +++++++++++++++++++++++++++++++++++++
 jjb/xci/xci-merge-jobs.yml         | 470 -------------------------------------
 jjb/xci/xci-verify-jobs.yaml       | 303 ++++++++++++++++++++++++
 jjb/xci/xci-verify-jobs.yml        | 303 ------------------------
 14 files changed, 1814 insertions(+), 1814 deletions(-)
 create mode 100644 jjb/xci/bifrost-cleanup-job.yaml
 delete mode 100644 jjb/xci/bifrost-cleanup-job.yml
 create mode 100644 jjb/xci/bifrost-periodic-jobs.yaml
 delete mode 100644 jjb/xci/bifrost-periodic-jobs.yml
 create mode 100644 jjb/xci/bifrost-verify-jobs.yaml
 delete mode 100644 jjb/xci/bifrost-verify-jobs.yml
 create mode 100644 jjb/xci/osa-periodic-jobs.yaml
 delete mode 100644 jjb/xci/osa-periodic-jobs.yml
 create mode 100644 jjb/xci/xci-daily-jobs.yaml
 delete mode 100644 jjb/xci/xci-daily-jobs.yml
 create mode 100644 jjb/xci/xci-merge-jobs.yaml
 delete mode 100644 jjb/xci/xci-merge-jobs.yml
 create mode 100644 jjb/xci/xci-verify-jobs.yaml
 delete mode 100644 jjb/xci/xci-verify-jobs.yml

(limited to 'jjb/xci')

diff --git a/jjb/xci/bifrost-cleanup-job.yaml b/jjb/xci/bifrost-cleanup-job.yaml
new file mode 100644
index 000000000..d51776173
--- /dev/null
+++ b/jjb/xci/bifrost-cleanup-job.yaml
@@ -0,0 +1,146 @@
+---
+- project:
+    name: 'openstack-bifrost-cleanup'
+    # -------------------------------
+    # branches
+    # -------------------------------
+    stream:
+      - master:
+          branch: '{stream}'
+
+    # -------------------------------
+    # projects
+    # -------------------------------
+    project:
+      - 'openstack':
+          project-repo: 'https://git.openstack.org/openstack/bifrost'
+          clone-location: '/opt/bifrost'
+      - 'opnfv':
+          project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci'
+          clone-location: '/opt/releng-xci'
+
+    # -------------------------------
+    # jobs
+    # -------------------------------
+    jobs:
+      - '{project}-bifrost-cleanup-{stream}'
+
+- job-template:
+    name: '{project}-bifrost-cleanup-{stream}'
+
+    disabled: true
+    concurrent: false
+
+    node: bifrost-verify-virtual
+
+    # Make sure no verify job is running on any of the slaves since that would
+    # produce build logs after we wipe the destination directory.
+    properties:
+      - build-blocker:
+          blocking-jobs:
+            - '{project}-bifrost-verify-*'
+
+    parameters:
+      - string:
+          name: PROJECT
+          default: '{project}'
+
+    builders:
+      - shell: |
+          #!/bin/bash
+
+          set -eu
+
+          # DO NOT change this unless you know what you are doing.
+          BIFROST_GS_URL="gs://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/"
+
+          # This should never happen... even 'recheck' uses the last jobs'
+          # gerrit information. Better exit with error so we can investigate
+          [[ ! -n $GERRIT_NAME ]] || [[ ! -n $GERRIT_CHANGE_NUMBER ]] && exit 1
+
+          echo "Removing build artifacts for $GERRIT_NAME/$GERRIT_CHANGE_NUMBER"
+
+          if ! [[ "$BIFROST_GS_URL" =~ "/cross-community-ci/openstack/bifrost/" ]]; then
+              echo "Oops! BIFROST_GS_URL=$BIFROST_GS_URL does not seem like a valid"
+              echo "bifrost location on the Google storage server. Please double-check"
+              echo "that it's set properly or fix this line if necessary."
+              echo "gsutil will not be executed until this is fixed!"
+              exit 1
+          fi
+          try_to_rm=1
+          while [[ $try_to_rm -lt 6 ]]; do
+              gsutil -m rm -r $BIFROST_GS_URL && _exitcode=$? && break
+              _exitcode=$?
+              echo "gsutil rm failed! Trying again... (attempt #$try_to_rm)"
+              let try_to_rm += 1
+              # Give it some time...
+              sleep 10
+          done
+          exit $_exitcode
+
+    triggers:
+      - '{project}-gerrit-trigger-cleanup':
+          branch: '{branch}'
+
+    publishers:
+      # yamllint disable rule:line-length
+      - email:
+          recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com zhang.jun3g@zte.com.cn
+      # yamllint enable rule:line-length
+      - email-jenkins-admins-on-failure
+# -------------------------------
+# trigger macros
+# -------------------------------
+- trigger:
+    name: 'openstack-gerrit-trigger-cleanup'
+    triggers:
+      - gerrit:
+          server-name: 'review.openstack.org'
+          escape-quotes: true
+          trigger-on:
+            # We only run this when the change is merged or
+            # abandoned since we don't need the logs anymore
+            - change-merged-event
+            - change-abandoned-event
+          # This is an OPNFV maintenance job. We don't want to provide
+          # feedback on Gerrit
+          silent: true
+          silent-start: true
+          projects:
+            - project-compare-type: 'PLAIN'
+              project-pattern: 'openstack/bifrost'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'true'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'doc/**'
+                - compare-type: ANT
+                  pattern: 'releasenotes/**'
+          readable-message: true
+
+- trigger:
+    name: 'opnfv-gerrit-trigger-cleanup'
+    triggers:
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            # We only run this when the change is merged or
+            # abandoned since we don't need the logs anymore
+            - change-merged-event
+            - change-abandoned-event
+          # This is an OPNFV maintenance job. We don't want to provide
+          # feedback on Gerrit
+          silent: true
+          silent-start: true
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'releng-xci'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'bifrost/**'
+          readable-message: true
diff --git a/jjb/xci/bifrost-cleanup-job.yml b/jjb/xci/bifrost-cleanup-job.yml
deleted file mode 100644
index d51776173..000000000
--- a/jjb/xci/bifrost-cleanup-job.yml
+++ /dev/null
@@ -1,146 +0,0 @@
----
-- project:
-    name: 'openstack-bifrost-cleanup'
-    # -------------------------------
-    # branches
-    # -------------------------------
-    stream:
-      - master:
-          branch: '{stream}'
-
-    # -------------------------------
-    # projects
-    # -------------------------------
-    project:
-      - 'openstack':
-          project-repo: 'https://git.openstack.org/openstack/bifrost'
-          clone-location: '/opt/bifrost'
-      - 'opnfv':
-          project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci'
-          clone-location: '/opt/releng-xci'
-
-    # -------------------------------
-    # jobs
-    # -------------------------------
-    jobs:
-      - '{project}-bifrost-cleanup-{stream}'
-
-- job-template:
-    name: '{project}-bifrost-cleanup-{stream}'
-
-    disabled: true
-    concurrent: false
-
-    node: bifrost-verify-virtual
-
-    # Make sure no verify job is running on any of the slaves since that would
-    # produce build logs after we wipe the destination directory.
-    properties:
-      - build-blocker:
-          blocking-jobs:
-            - '{project}-bifrost-verify-*'
-
-    parameters:
-      - string:
-          name: PROJECT
-          default: '{project}'
-
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          set -eu
-
-          # DO NOT change this unless you know what you are doing.
-          BIFROST_GS_URL="gs://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/"
-
-          # This should never happen... even 'recheck' uses the last jobs'
-          # gerrit information. Better exit with error so we can investigate
-          [[ ! -n $GERRIT_NAME ]] || [[ ! -n $GERRIT_CHANGE_NUMBER ]] && exit 1
-
-          echo "Removing build artifacts for $GERRIT_NAME/$GERRIT_CHANGE_NUMBER"
-
-          if ! [[ "$BIFROST_GS_URL" =~ "/cross-community-ci/openstack/bifrost/" ]]; then
-              echo "Oops! BIFROST_GS_URL=$BIFROST_GS_URL does not seem like a valid"
-              echo "bifrost location on the Google storage server. Please double-check"
-              echo "that it's set properly or fix this line if necessary."
-              echo "gsutil will not be executed until this is fixed!"
-              exit 1
-          fi
-          try_to_rm=1
-          while [[ $try_to_rm -lt 6 ]]; do
-              gsutil -m rm -r $BIFROST_GS_URL && _exitcode=$? && break
-              _exitcode=$?
-              echo "gsutil rm failed! Trying again... (attempt #$try_to_rm)"
-              let try_to_rm += 1
-              # Give it some time...
-              sleep 10
-          done
-          exit $_exitcode
-
-    triggers:
-      - '{project}-gerrit-trigger-cleanup':
-          branch: '{branch}'
-
-    publishers:
-      # yamllint disable rule:line-length
-      - email:
-          recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com zhang.jun3g@zte.com.cn
-      # yamllint enable rule:line-length
-      - email-jenkins-admins-on-failure
-# -------------------------------
-# trigger macros
-# -------------------------------
-- trigger:
-    name: 'openstack-gerrit-trigger-cleanup'
-    triggers:
-      - gerrit:
-          server-name: 'review.openstack.org'
-          escape-quotes: true
-          trigger-on:
-            # We only run this when the change is merged or
-            # abandoned since we don't need the logs anymore
-            - change-merged-event
-            - change-abandoned-event
-          # This is an OPNFV maintenance job. We don't want to provide
-          # feedback on Gerrit
-          silent: true
-          silent-start: true
-          projects:
-            - project-compare-type: 'PLAIN'
-              project-pattern: 'openstack/bifrost'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              disable-strict-forbidden-file-verification: 'true'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'doc/**'
-                - compare-type: ANT
-                  pattern: 'releasenotes/**'
-          readable-message: true
-
-- trigger:
-    name: 'opnfv-gerrit-trigger-cleanup'
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            # We only run this when the change is merged or
-            # abandoned since we don't need the logs anymore
-            - change-merged-event
-            - change-abandoned-event
-          # This is an OPNFV maintenance job. We don't want to provide
-          # feedback on Gerrit
-          silent: true
-          silent-start: true
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'releng-xci'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'bifrost/**'
-          readable-message: true
diff --git a/jjb/xci/bifrost-periodic-jobs.yaml b/jjb/xci/bifrost-periodic-jobs.yaml
new file mode 100644
index 000000000..fbe2e205a
--- /dev/null
+++ b/jjb/xci/bifrost-periodic-jobs.yaml
@@ -0,0 +1,152 @@
+---
+- project:
+    project: 'releng-xci'
+
+    name: 'bifrost-periodic'
+    # -------------------------------
+    # Branch Anchors
+    # -------------------------------
+    # the versions stated here default to branches which then later
+    # on used for checking out the branches, pulling in head of the branch.
+    master: &master
+      stream: master
+      openstack-bifrost-version: '{stream}'
+      opnfv-releng-version: 'master'
+      gs-pathname: ''
+    ocata: &ocata
+      stream: ocata
+      openstack-bifrost-version: 'stable/{stream}'
+      opnfv-releng-version: 'master'
+      gs-pathname: '/{stream}'
+    # -------------------------------
+    #        XCI PODs
+    # -------------------------------
+    pod:
+      - virtual:
+          <<: *master
+      - virtual:
+          <<: *ocata
+    # -------------------------------
+    # XCI PODs
+    # -------------------------------
+    # -------------------------------
+    # Supported Distros
+    # -------------------------------
+    distro:
+      - 'xenial':
+          disabled: false
+          slave-label: xci-xenial-virtual
+          dib-os-release: 'xenial'
+          dib-os-element: 'ubuntu-minimal'
+          # yamllint disable rule:line-length
+          dib-os-packages: 'vlan,vim,less,bridge-utils,sudo,language-pack-en,iputils-ping,rsyslog,curl,python,debootstrap,ifenslave,ifenslave-2.6,lsof,lvm2,tcpdump,nfs-kernel-server,chrony,iptables'
+          # yamllint enable rule:line-length
+          extra-dib-elements: 'openssh-server'
+      - 'centos7':
+          disabled: true
+          slave-label: xci-centos7-virtual
+          dib-os-release: '7'
+          dib-os-element: 'centos7'
+          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
+      - 'suse':
+          disabled: true
+          slave-label: xci-suse-virtual
+          dib-os-release: '42.3'
+          dib-os-element: 'opensuse-minimal'
+          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
+
+    # -------------------------------
+    # jobs
+    # -------------------------------
+    jobs:
+      - 'bifrost-provision-{pod}-{distro}-periodic-{stream}'
+
+# -------------------------------
+# job templates
+# -------------------------------
+- job-template:
+    name: 'bifrost-provision-{pod}-{distro}-periodic-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    properties:
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '^xci-os.*'
+            - '^xci-deploy.*'
+            - '^xci-functest.*'
+            - '^bifrost-.*periodic.*'
+            - '^osa-.*periodic.*'
+          block-level: 'NODE'
+      - logrotate-default
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{opnfv-releng-version}'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+      - string:
+          name: XCI_FLAVOR
+          default: 'ha'
+      - string:
+          name: OPENSTACK_BIFROST_VERSION
+          default: '{openstack-bifrost-version}'
+      - string:
+          name: OPNFV_RELENG_VERSION
+          default: '{opnfv-releng-version}'
+      - string:
+          name: DISTRO
+          default: '{distro}'
+      - string:
+          name: DIB_OS_RELEASE
+          default: '{dib-os-release}'
+      - string:
+          name: DIB_OS_ELEMENT
+          default: '{dib-os-element}'
+      - string:
+          name: DIB_OS_PACKAGES
+          default: '{dib-os-packages}'
+      - string:
+          name: EXTRA_DIB_ELEMENTS
+          default: '{extra-dib-elements}'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - label:
+          name: SLAVE_LABEL
+          default: '{slave-label}'
+      - string:
+          name: CI_LOOP
+          default: 'periodic'
+
+    wrappers:
+      - fix-workspace-permissions
+
+    scm:
+      - git-scm
+
+    # trigger is disabled until we know which jobs we will have
+    # and adjust stuff accordingly
+    triggers:
+      - timed: ''  # '@midnight'
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME - Flavor: $XCI_FLAVOR"
+      - 'bifrost-provision-builder'
+
+# --------------------------
+# builder macros
+# --------------------------
+- builder:
+    name: bifrost-provision-builder
+    builders:
+      - shell:
+          !include-raw: ./bifrost-provision.sh
diff --git a/jjb/xci/bifrost-periodic-jobs.yml b/jjb/xci/bifrost-periodic-jobs.yml
deleted file mode 100644
index fbe2e205a..000000000
--- a/jjb/xci/bifrost-periodic-jobs.yml
+++ /dev/null
@@ -1,152 +0,0 @@
----
-- project:
-    project: 'releng-xci'
-
-    name: 'bifrost-periodic'
-    # -------------------------------
-    # Branch Anchors
-    # -------------------------------
-    # the versions stated here default to branches which then later
-    # on used for checking out the branches, pulling in head of the branch.
-    master: &master
-      stream: master
-      openstack-bifrost-version: '{stream}'
-      opnfv-releng-version: 'master'
-      gs-pathname: ''
-    ocata: &ocata
-      stream: ocata
-      openstack-bifrost-version: 'stable/{stream}'
-      opnfv-releng-version: 'master'
-      gs-pathname: '/{stream}'
-    # -------------------------------
-    #        XCI PODs
-    # -------------------------------
-    pod:
-      - virtual:
-          <<: *master
-      - virtual:
-          <<: *ocata
-    # -------------------------------
-    # XCI PODs
-    # -------------------------------
-    # -------------------------------
-    # Supported Distros
-    # -------------------------------
-    distro:
-      - 'xenial':
-          disabled: false
-          slave-label: xci-xenial-virtual
-          dib-os-release: 'xenial'
-          dib-os-element: 'ubuntu-minimal'
-          # yamllint disable rule:line-length
-          dib-os-packages: 'vlan,vim,less,bridge-utils,sudo,language-pack-en,iputils-ping,rsyslog,curl,python,debootstrap,ifenslave,ifenslave-2.6,lsof,lvm2,tcpdump,nfs-kernel-server,chrony,iptables'
-          # yamllint enable rule:line-length
-          extra-dib-elements: 'openssh-server'
-      - 'centos7':
-          disabled: true
-          slave-label: xci-centos7-virtual
-          dib-os-release: '7'
-          dib-os-element: 'centos7'
-          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
-          extra-dib-elements: 'openssh-server'
-      - 'suse':
-          disabled: true
-          slave-label: xci-suse-virtual
-          dib-os-release: '42.3'
-          dib-os-element: 'opensuse-minimal'
-          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
-          extra-dib-elements: 'openssh-server'
-
-    # -------------------------------
-    # jobs
-    # -------------------------------
-    jobs:
-      - 'bifrost-provision-{pod}-{distro}-periodic-{stream}'
-
-# -------------------------------
-# job templates
-# -------------------------------
-- job-template:
-    name: 'bifrost-provision-{pod}-{distro}-periodic-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    properties:
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '^xci-os.*'
-            - '^xci-deploy.*'
-            - '^xci-functest.*'
-            - '^bifrost-.*periodic.*'
-            - '^osa-.*periodic.*'
-          block-level: 'NODE'
-      - logrotate-default
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{opnfv-releng-version}'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-      - string:
-          name: XCI_FLAVOR
-          default: 'ha'
-      - string:
-          name: OPENSTACK_BIFROST_VERSION
-          default: '{openstack-bifrost-version}'
-      - string:
-          name: OPNFV_RELENG_VERSION
-          default: '{opnfv-releng-version}'
-      - string:
-          name: DISTRO
-          default: '{distro}'
-      - string:
-          name: DIB_OS_RELEASE
-          default: '{dib-os-release}'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: '{dib-os-element}'
-      - string:
-          name: DIB_OS_PACKAGES
-          default: '{dib-os-packages}'
-      - string:
-          name: EXTRA_DIB_ELEMENTS
-          default: '{extra-dib-elements}'
-      - string:
-          name: CLEAN_DIB_IMAGES
-          default: 'true'
-      - label:
-          name: SLAVE_LABEL
-          default: '{slave-label}'
-      - string:
-          name: CI_LOOP
-          default: 'periodic'
-
-    wrappers:
-      - fix-workspace-permissions
-
-    scm:
-      - git-scm
-
-    # trigger is disabled until we know which jobs we will have
-    # and adjust stuff accordingly
-    triggers:
-      - timed: ''  # '@midnight'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME - Flavor: $XCI_FLAVOR"
-      - 'bifrost-provision-builder'
-
-# --------------------------
-# builder macros
-# --------------------------
-- builder:
-    name: bifrost-provision-builder
-    builders:
-      - shell:
-          !include-raw: ./bifrost-provision.sh
diff --git a/jjb/xci/bifrost-verify-jobs.yaml b/jjb/xci/bifrost-verify-jobs.yaml
new file mode 100644
index 000000000..920ecdc7d
--- /dev/null
+++ b/jjb/xci/bifrost-verify-jobs.yaml
@@ -0,0 +1,217 @@
+---
+- project:
+    name: 'openstack-bifrost-verify'
+    # -------------------------------
+    # branches
+    # -------------------------------
+    stream:
+      - master:
+          branch: '{stream}'
+    # -------------------------------
+    # distros
+    # -------------------------------
+    distro:
+      - 'xenial':
+          disabled: true
+          dib-os-release: 'xenial'
+          dib-os-element: 'ubuntu-minimal'
+          dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
+      - 'centos7':
+          disabled: true
+          dib-os-release: '7'
+          dib-os-element: 'centos-minimal'
+          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
+      - 'opensuse423':
+          disabled: true
+          dib-os-release: '42.3'
+          dib-os-element: 'opensuse-minimal'
+          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
+    # -------------------------------
+    # type
+    # -------------------------------
+    type:
+      - virtual
+    # -------------------------------
+    # jobs
+    # -------------------------------
+    jobs:
+      - 'openstack-bifrost-verify-{distro}-{type}-{stream}'
+
+# -------------------------------
+# VM defaults
+# -------------------------------
+- defaults:
+    name: verify_vm_defaults
+    test-vm-num-nodes: '3'
+    test-vm-node-names: 'opnfv controller00 compute00'
+    vm-domain-type: 'kvm'
+    vm-cpu: '2'
+    vm-disk: '30'
+    vm-memory-size: '4096'
+    vm-disk-cache: 'unsafe'
+
+# -------------------------------
+# job templates
+# -------------------------------
+- job-template:
+    name: 'openstack-bifrost-verify-{distro}-{type}-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    defaults: verify_vm_defaults
+
+    concurrent: false
+
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'xci-verify-{distro}-.*'
+            - 'xci-.*-{distro}-merge-.*'
+            - '.*-bifrost-verify.*-{type}'
+      - throttle:
+          max-per-node: 2
+          max-total: 10
+          categories:
+            - xci-verify-virtual
+          option: category
+
+          block-level: 'NODE'
+
+    parameters:
+      - string:
+          name: PROJECT_REPO
+          default: 'https://git.openstack.org/openstack/bifrost'
+      - string:
+          name: DISTRO
+          default: '{distro}'
+      - string:
+          name: DIB_OS_RELEASE
+          default: '{dib-os-release}'
+      - string:
+          name: DIB_OS_ELEMENT
+          default: '{dib-os-element}'
+      - string:
+          name: EXTRA_DIB_ELEMENTS
+          default: '{extra-dib-elements}'
+      - string:
+          name: DIB_OS_PACKAGES
+          default: '{dib-os-packages}'
+      - string:
+          name: TEST_VM_NUM_NODES
+          default: '{test-vm-num-nodes}'
+      - string:
+          name: TEST_VM_NODE_NAMES
+          default: '{test-vm-node-names}'
+      - string:
+          name: VM_DOMAIN_TYPE
+          default: '{vm-domain-type}'
+      - string:
+          name: VM_CPU
+          default: '{vm-cpu}'
+      - string:
+          name: VM_DISK
+          default: '{vm-disk}'
+      - string:
+          name: VM_MEMORY_SIZE
+          default: '{vm-memory-size}'
+      - string:
+          name: VM_DISK_CACHE
+          default: '{vm-disk-cache}'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - label:
+          name: SLAVE_LABEL
+          default: 'xci-virtual'
+      - string:
+          name: CI_LOOP
+          default: 'verify'
+
+    scm:
+      - git:
+          url: '$PROJECT_REPO'
+          refspec: '$GERRIT_REFSPEC'
+          branches:
+            - 'origin/$BRANCH'
+          skip-tag: true
+          choosing-strategy: 'gerrit'
+          timeout: 10
+          wipe-workspace: true
+
+    triggers:
+      - 'openstack-gerrit-trigger':
+          branch: '{branch}'
+
+    builders:
+      - bifrost-set-name
+      - bifrost-build
+
+    wrappers:
+      - fix-workspace-permissions
+      - build-timeout:
+          timeout: 180
+
+    publishers:
+      # yamllint disable rule:line-length
+      - email:
+          recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com julienjut@gmail.com
+      # yamllint enable rule:line-length
+      - email-jenkins-admins-on-failure
+      - postbuildscript:
+          script-only-if-succeeded: false
+          script-only-if-failed: false
+          builders:
+            - shell:
+                !include-raw: ./xci-cleanup.sh
+
+# -------------------------------
+# trigger macros
+# -------------------------------
+- trigger:
+    name: 'openstack-gerrit-trigger'
+    triggers:
+      - gerrit:
+          server-name: 'review.openstack.org'
+          escape-quotes: true
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+          silent-start: true
+          custom-url: '* $JOB_NAME $BUILD_URL'
+          projects:
+            - project-compare-type: 'PLAIN'
+              project-pattern: 'openstack/bifrost'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'true'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'doc/**'
+                - compare-type: ANT
+                  pattern: 'releasenotes/**'
+          readable-message: true
+
+# --------------------------
+# builder macros
+# --------------------------
+- builder:
+    name: bifrost-set-name
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME"
+
+- builder:
+    name: bifrost-build
+    builders:
+      - shell:
+          !include-raw: ./bifrost-verify.sh
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
deleted file mode 100644
index 920ecdc7d..000000000
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ /dev/null
@@ -1,217 +0,0 @@
----
-- project:
-    name: 'openstack-bifrost-verify'
-    # -------------------------------
-    # branches
-    # -------------------------------
-    stream:
-      - master:
-          branch: '{stream}'
-    # -------------------------------
-    # distros
-    # -------------------------------
-    distro:
-      - 'xenial':
-          disabled: true
-          dib-os-release: 'xenial'
-          dib-os-element: 'ubuntu-minimal'
-          dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
-          extra-dib-elements: 'openssh-server'
-      - 'centos7':
-          disabled: true
-          dib-os-release: '7'
-          dib-os-element: 'centos-minimal'
-          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
-          extra-dib-elements: 'openssh-server'
-      - 'opensuse423':
-          disabled: true
-          dib-os-release: '42.3'
-          dib-os-element: 'opensuse-minimal'
-          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
-          extra-dib-elements: 'openssh-server'
-    # -------------------------------
-    # type
-    # -------------------------------
-    type:
-      - virtual
-    # -------------------------------
-    # jobs
-    # -------------------------------
-    jobs:
-      - 'openstack-bifrost-verify-{distro}-{type}-{stream}'
-
-# -------------------------------
-# VM defaults
-# -------------------------------
-- defaults:
-    name: verify_vm_defaults
-    test-vm-num-nodes: '3'
-    test-vm-node-names: 'opnfv controller00 compute00'
-    vm-domain-type: 'kvm'
-    vm-cpu: '2'
-    vm-disk: '30'
-    vm-memory-size: '4096'
-    vm-disk-cache: 'unsafe'
-
-# -------------------------------
-# job templates
-# -------------------------------
-- job-template:
-    name: 'openstack-bifrost-verify-{distro}-{type}-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    defaults: verify_vm_defaults
-
-    concurrent: false
-
-    properties:
-      - logrotate-default
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'xci-verify-{distro}-.*'
-            - 'xci-.*-{distro}-merge-.*'
-            - '.*-bifrost-verify.*-{type}'
-      - throttle:
-          max-per-node: 2
-          max-total: 10
-          categories:
-            - xci-verify-virtual
-          option: category
-
-          block-level: 'NODE'
-
-    parameters:
-      - string:
-          name: PROJECT_REPO
-          default: 'https://git.openstack.org/openstack/bifrost'
-      - string:
-          name: DISTRO
-          default: '{distro}'
-      - string:
-          name: DIB_OS_RELEASE
-          default: '{dib-os-release}'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: '{dib-os-element}'
-      - string:
-          name: EXTRA_DIB_ELEMENTS
-          default: '{extra-dib-elements}'
-      - string:
-          name: DIB_OS_PACKAGES
-          default: '{dib-os-packages}'
-      - string:
-          name: TEST_VM_NUM_NODES
-          default: '{test-vm-num-nodes}'
-      - string:
-          name: TEST_VM_NODE_NAMES
-          default: '{test-vm-node-names}'
-      - string:
-          name: VM_DOMAIN_TYPE
-          default: '{vm-domain-type}'
-      - string:
-          name: VM_CPU
-          default: '{vm-cpu}'
-      - string:
-          name: VM_DISK
-          default: '{vm-disk}'
-      - string:
-          name: VM_MEMORY_SIZE
-          default: '{vm-memory-size}'
-      - string:
-          name: VM_DISK_CACHE
-          default: '{vm-disk-cache}'
-      - string:
-          name: CLEAN_DIB_IMAGES
-          default: 'true'
-      - label:
-          name: SLAVE_LABEL
-          default: 'xci-virtual'
-      - string:
-          name: CI_LOOP
-          default: 'verify'
-
-    scm:
-      - git:
-          url: '$PROJECT_REPO'
-          refspec: '$GERRIT_REFSPEC'
-          branches:
-            - 'origin/$BRANCH'
-          skip-tag: true
-          choosing-strategy: 'gerrit'
-          timeout: 10
-          wipe-workspace: true
-
-    triggers:
-      - 'openstack-gerrit-trigger':
-          branch: '{branch}'
-
-    builders:
-      - bifrost-set-name
-      - bifrost-build
-
-    wrappers:
-      - fix-workspace-permissions
-      - build-timeout:
-          timeout: 180
-
-    publishers:
-      # yamllint disable rule:line-length
-      - email:
-          recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com julienjut@gmail.com
-      # yamllint enable rule:line-length
-      - email-jenkins-admins-on-failure
-      - postbuildscript:
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          builders:
-            - shell:
-                !include-raw: ./xci-cleanup.sh
-
-# -------------------------------
-# trigger macros
-# -------------------------------
-- trigger:
-    name: 'openstack-gerrit-trigger'
-    triggers:
-      - gerrit:
-          server-name: 'review.openstack.org'
-          escape-quotes: true
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-          silent-start: true
-          custom-url: '* $JOB_NAME $BUILD_URL'
-          projects:
-            - project-compare-type: 'PLAIN'
-              project-pattern: 'openstack/bifrost'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              disable-strict-forbidden-file-verification: 'true'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'doc/**'
-                - compare-type: ANT
-                  pattern: 'releasenotes/**'
-          readable-message: true
-
-# --------------------------
-# builder macros
-# --------------------------
-- builder:
-    name: bifrost-set-name
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-
-- builder:
-    name: bifrost-build
-    builders:
-      - shell:
-          !include-raw: ./bifrost-verify.sh
diff --git a/jjb/xci/osa-periodic-jobs.yaml b/jjb/xci/osa-periodic-jobs.yaml
new file mode 100644
index 000000000..6c2d165a4
--- /dev/null
+++ b/jjb/xci/osa-periodic-jobs.yaml
@@ -0,0 +1,261 @@
+---
+- project:
+    name: 'opnfv-osa-periodic'
+
+    project: openstack-ansible
+    # -------------------------------
+    # branches
+    # -------------------------------
+    stream:
+      - master:
+          branch: '{stream}'
+    # -------------------------------
+    # distros
+    # -------------------------------
+    distro:
+      - ubuntu:
+          disabled: false
+      - centos:
+          disabled: false
+      - opensuse:
+          disabled: false
+    # -------------------------------
+    # type
+    # -------------------------------
+    type:
+      - virtual
+    # -------------------------------
+    # periodic deploy & test phases
+    # -------------------------------
+    phase:
+      - 'deploy'
+      - 'healthcheck'
+    # -------------------------------
+    # jobs
+    # -------------------------------
+    jobs:
+      - 'xci-osa-periodic-{distro}-{type}-{stream}'
+      - 'xci-osa-periodic-{distro}-{phase}-{type}-{stream}'
+# -------------------------------
+# job templates
+# -------------------------------
+- job-template:
+    name: 'xci-osa-periodic-{distro}-{type}-{stream}'
+
+    project-type: multijob
+
+    disabled: '{obj:disabled}'
+
+    concurrent: true
+
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'xci-verify-{distro}-.*'
+            - 'bifrost-verify-{distro}-.*'
+            - 'bifrost-periodic-{distro}-.*'
+            - 'xci-osa-verify-{distro}-.*'
+            - 'xci-osa-periodic-{distro}-.*'
+          block-level: 'NODE'
+      - throttle:
+          max-per-node: 2
+          max-total: 10
+          categories:
+            - xci-verify-virtual
+          option: category
+
+    wrappers:
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
+      - fix-workspace-permissions
+
+    scm:
+      - git-scm-openstack
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - label:
+          name: SLAVE_LABEL
+          default: 'xci-virtual'
+      - string:
+          name: OPENSTACK_OSA_VERSION
+          default: 'master'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - string:
+          name: GIT_BASE
+          default: 'https://git.openstack.org/openstack/$PROJECT'
+          description: 'Git URL to use on this Jenkins Slave'
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - multijob:
+          name: deploy
+          condition: SUCCESSFUL
+          projects:
+            - name: 'xci-osa-periodic-{distro}-deploy-{type}-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                DISTRO={distro}
+                DEPLOY_SCENARIO=os-nosdn-nofeature-noha
+                OPENSTACK_OSA_VERSION=$OPENSTACK_OSA_VERSION
+                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+                BRANCH=$BRANCH
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+              git-revision: true
+      - multijob:
+          name: healthcheck
+          condition: SUCCESSFUL
+          projects:
+            - name: 'xci-osa-periodic-{distro}-healthcheck-{type}-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                DISTRO={distro}
+                DEPLOY_SCENARIO=os-nosdn-nofeature-noha
+                OPENSTACK_OSA_VERSION=$OPENSTACK_OSA_VERSION
+                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+                FUNCTEST_MODE=tier
+                FUNCTEST_TIER=healthcheck
+                BRANCH=$BRANCH
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+
+- job-template:
+    name: 'xci-osa-periodic-{distro}-{phase}-{type}-{stream}'
+
+    disabled: false
+
+    concurrent: true
+
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '.*-bifrost-verify-.*'
+            - '.*-bifrost-periodic-.*'
+          block-level: 'NODE'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - string:
+          name: DISTRO
+          default: 'ubuntu'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-noha'
+      - string:
+          name: OPENSTACK_OSA_VERSION
+          default: 'master'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'tier'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'healthcheck'
+      - string:
+          name: XCI_FLAVOR
+          default: 'mini'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - string:
+          name: INSTALLER_TYPE
+          default: 'osa'
+      - string:
+          name: GIT_BASE
+          default: 'https://git.openstack.org/openstack/$PROJECT'
+          description: 'Git URL to use on this Jenkins Slave'
+
+    wrappers:
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
+      - fix-workspace-permissions
+
+    scm:
+      - git-scm-openstack
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - 'xci-osa-periodic-{phase}-macro'
+
+# -------------------------------
+# builder macros
+# -------------------------------
+- builder:
+    name: 'xci-osa-periodic-deploy-macro'
+    builders:
+      - shell: |
+          #!/bin/bash
+
+          cd $WORKSPACE
+
+          # The start-new-vm.sh script will copy the entire releng-xci directory
+          # so lets prepare the test script now so it can be copied by the script.
+          # Please do not move it elsewhere or you would have to move it to the VM
+          # yourself.
+          cat > xci_test.sh<<EOF
+          #!/bin/bash
+          export DISTRO=$DISTRO
+          export DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+          export OPENSTACK_OSA_VERSION=$OPENSTACK_OSA_VERSION
+          export FUNCTEST_MODE=$FUNCTEST_MODE
+          export FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
+          export XCI_FLAVOR=$XCI_FLAVOR
+          export CORE_OPENSTACK_INSTALL=true
+          export CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+          export OPNFV_RELENG_DEV_PATH=/home/devuser/releng-xci/
+          export INSTALLER_TYPE=$INSTALLER_TYPE
+          export GIT_BASE=$GIT_BASE
+          export JENKINS_HOME=$JENKINS_HOME
+
+          cd xci
+          ./xci-deploy.sh
+          EOF
+          chmod a+x xci_test.sh
+
+          export XCI_BUILD_CLEAN_VM_OS=false
+          export XCI_UPDATE_CLEAN_VM_OS=true
+
+          ./xci/scripts/vm/start-new-vm.sh $DISTRO
+      - shell: |
+          #!/bin/bash
+
+          ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh"
+
+
+- builder:
+    name: 'xci-osa-periodic-healthcheck-macro'
+    builders:
+      - shell: |
+          #!/bin/bash
+
+          echo "Hello World!"
+      - shell: |
+          #!/bin/bash
+
+          sudo virsh destroy ${DISTRO}_xci_vm || true
+          sudo virsh undefine ${DISTRO}_xci_vm || true
+
+# this will be enabled once the xci is prepared
+# - builder:
+#    name: 'xci-verify-healthcheck-macro'
+#    builders:
+#        - shell:
+#            !include-raw: ../../utils/fetch_os_creds.sh
+#        - shell:
+#            !include-raw: ../functest/functest-alpine.sh
diff --git a/jjb/xci/osa-periodic-jobs.yml b/jjb/xci/osa-periodic-jobs.yml
deleted file mode 100644
index 6c2d165a4..000000000
--- a/jjb/xci/osa-periodic-jobs.yml
+++ /dev/null
@@ -1,261 +0,0 @@
----
-- project:
-    name: 'opnfv-osa-periodic'
-
-    project: openstack-ansible
-    # -------------------------------
-    # branches
-    # -------------------------------
-    stream:
-      - master:
-          branch: '{stream}'
-    # -------------------------------
-    # distros
-    # -------------------------------
-    distro:
-      - ubuntu:
-          disabled: false
-      - centos:
-          disabled: false
-      - opensuse:
-          disabled: false
-    # -------------------------------
-    # type
-    # -------------------------------
-    type:
-      - virtual
-    # -------------------------------
-    # periodic deploy & test phases
-    # -------------------------------
-    phase:
-      - 'deploy'
-      - 'healthcheck'
-    # -------------------------------
-    # jobs
-    # -------------------------------
-    jobs:
-      - 'xci-osa-periodic-{distro}-{type}-{stream}'
-      - 'xci-osa-periodic-{distro}-{phase}-{type}-{stream}'
-# -------------------------------
-# job templates
-# -------------------------------
-- job-template:
-    name: 'xci-osa-periodic-{distro}-{type}-{stream}'
-
-    project-type: multijob
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'xci-verify-{distro}-.*'
-            - 'bifrost-verify-{distro}-.*'
-            - 'bifrost-periodic-{distro}-.*'
-            - 'xci-osa-verify-{distro}-.*'
-            - 'xci-osa-periodic-{distro}-.*'
-          block-level: 'NODE'
-      - throttle:
-          max-per-node: 2
-          max-total: 10
-          categories:
-            - xci-verify-virtual
-          option: category
-
-    wrappers:
-      - ssh-agent-wrapper
-      - build-timeout:
-          timeout: 240
-      - fix-workspace-permissions
-
-    scm:
-      - git-scm-openstack
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - label:
-          name: SLAVE_LABEL
-          default: 'xci-virtual'
-      - string:
-          name: OPENSTACK_OSA_VERSION
-          default: 'master'
-      - string:
-          name: CLEAN_DIB_IMAGES
-          default: 'true'
-      - string:
-          name: GIT_BASE
-          default: 'https://git.openstack.org/openstack/$PROJECT'
-          description: 'Git URL to use on this Jenkins Slave'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - multijob:
-          name: deploy
-          condition: SUCCESSFUL
-          projects:
-            - name: 'xci-osa-periodic-{distro}-deploy-{type}-{stream}'
-              current-parameters: true
-              predefined-parameters: |
-                DISTRO={distro}
-                DEPLOY_SCENARIO=os-nosdn-nofeature-noha
-                OPENSTACK_OSA_VERSION=$OPENSTACK_OSA_VERSION
-                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
-                BRANCH=$BRANCH
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-              git-revision: true
-      - multijob:
-          name: healthcheck
-          condition: SUCCESSFUL
-          projects:
-            - name: 'xci-osa-periodic-{distro}-healthcheck-{type}-{stream}'
-              current-parameters: true
-              predefined-parameters: |
-                DISTRO={distro}
-                DEPLOY_SCENARIO=os-nosdn-nofeature-noha
-                OPENSTACK_OSA_VERSION=$OPENSTACK_OSA_VERSION
-                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
-                FUNCTEST_MODE=tier
-                FUNCTEST_TIER=healthcheck
-                BRANCH=$BRANCH
-              node-parameters: true
-              kill-phase-on: NEVER
-              abort-all-job: true
-
-- job-template:
-    name: 'xci-osa-periodic-{distro}-{phase}-{type}-{stream}'
-
-    disabled: false
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '.*-bifrost-verify-.*'
-            - '.*-bifrost-periodic-.*'
-          block-level: 'NODE'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - string:
-          name: DISTRO
-          default: 'ubuntu'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-noha'
-      - string:
-          name: OPENSTACK_OSA_VERSION
-          default: 'master'
-      - string:
-          name: FUNCTEST_MODE
-          default: 'tier'
-      - string:
-          name: FUNCTEST_SUITE_NAME
-          default: 'healthcheck'
-      - string:
-          name: XCI_FLAVOR
-          default: 'mini'
-      - string:
-          name: CLEAN_DIB_IMAGES
-          default: 'true'
-      - string:
-          name: INSTALLER_TYPE
-          default: 'osa'
-      - string:
-          name: GIT_BASE
-          default: 'https://git.openstack.org/openstack/$PROJECT'
-          description: 'Git URL to use on this Jenkins Slave'
-
-    wrappers:
-      - ssh-agent-wrapper
-      - build-timeout:
-          timeout: 240
-      - fix-workspace-permissions
-
-    scm:
-      - git-scm-openstack
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - 'xci-osa-periodic-{phase}-macro'
-
-# -------------------------------
-# builder macros
-# -------------------------------
-- builder:
-    name: 'xci-osa-periodic-deploy-macro'
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          cd $WORKSPACE
-
-          # The start-new-vm.sh script will copy the entire releng-xci directory
-          # so lets prepare the test script now so it can be copied by the script.
-          # Please do not move it elsewhere or you would have to move it to the VM
-          # yourself.
-          cat > xci_test.sh<<EOF
-          #!/bin/bash
-          export DISTRO=$DISTRO
-          export DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-          export OPENSTACK_OSA_VERSION=$OPENSTACK_OSA_VERSION
-          export FUNCTEST_MODE=$FUNCTEST_MODE
-          export FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
-          export XCI_FLAVOR=$XCI_FLAVOR
-          export CORE_OPENSTACK_INSTALL=true
-          export CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
-          export OPNFV_RELENG_DEV_PATH=/home/devuser/releng-xci/
-          export INSTALLER_TYPE=$INSTALLER_TYPE
-          export GIT_BASE=$GIT_BASE
-          export JENKINS_HOME=$JENKINS_HOME
-
-          cd xci
-          ./xci-deploy.sh
-          EOF
-          chmod a+x xci_test.sh
-
-          export XCI_BUILD_CLEAN_VM_OS=false
-          export XCI_UPDATE_CLEAN_VM_OS=true
-
-          ./xci/scripts/vm/start-new-vm.sh $DISTRO
-      - shell: |
-          #!/bin/bash
-
-          ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh"
-
-
-- builder:
-    name: 'xci-osa-periodic-healthcheck-macro'
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          echo "Hello World!"
-      - shell: |
-          #!/bin/bash
-
-          sudo virsh destroy ${DISTRO}_xci_vm || true
-          sudo virsh undefine ${DISTRO}_xci_vm || true
-
-# this will be enabled once the xci is prepared
-# - builder:
-#    name: 'xci-verify-healthcheck-macro'
-#    builders:
-#        - shell:
-#            !include-raw: ../../utils/fetch_os_creds.sh
-#        - shell:
-#            !include-raw: ../functest/functest-alpine.sh
diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
new file mode 100644
index 000000000..11db4e168
--- /dev/null
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -0,0 +1,265 @@
+---
+# -------------------------------
+# These jobs run on a daily basis and deploy OpenStack
+# using the pinned versions of opnfv/releng, openstack/bifrost
+# and openstack/openstack-ansible. Due to this, there is no
+# version/branch is set/passed to jobs and instead the versions
+# are checked out based on what is configured.
+# -------------------------------
+- project:
+    project: 'releng-xci'
+
+    name: 'xci-daily'
+    # -------------------------------
+    # Branch Anchors
+    # -------------------------------
+    master: &master
+      stream: master
+      opnfv-releng-version: master
+      gs-pathname: ''
+    # -------------------------------
+    # Scenarios
+    # -------------------------------
+    scenario:
+      - 'os-nosdn-nofeature-ha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          xci-flavor: 'ha'
+      - 'os-nosdn-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          xci-flavor: 'noha'
+      - 'os-odl-sfc-ha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          xci-flavor: 'ha'
+      - 'os-odl-sfc-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          xci-flavor: 'noha'
+    # -------------------------------
+    # XCI PODs
+    # -------------------------------
+    pod:
+      - virtual:
+          <<: *master
+    # -------------------------------
+    # Supported Distros
+    # -------------------------------
+    distro:
+      - 'xenial':
+          disabled: false
+          slave-label: xci-xenial-virtual
+          dib-os-release: 'xenial'
+          dib-os-element: 'ubuntu-minimal'
+          # yamllint disable rule:line-length
+          dib-os-packages: 'vlan,vim,less,bridge-utils,sudo,language-pack-en,iputils-ping,rsyslog,curl,python,debootstrap,ifenslave,ifenslave-2.6,lsof,lvm2,tcpdump,nfs-kernel-server,chrony,iptabls'
+          # yamllint enable rule:line-length
+          extra-dib-elements: 'openssh-server'
+      - 'centos7':
+          disabled: true
+          slave-label: xci-centos7-virtual
+          dib-os-release: '7'
+          dib-os-element: 'centos7'
+          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
+      - 'suse':
+          disabled: true
+          slave-label: xci-suse-virtual
+          dib-os-release: '42.3'
+          dib-os-element: 'opensuse-minimal'
+          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
+
+    # -------------------------------
+    #        Phases
+    # -------------------------------
+    phase:
+      - 'deploy'
+      - 'functest'
+    # -------------------------------
+    # jobs
+    # -------------------------------
+    jobs:
+      - 'xci-{scenario}-{pod}-{distro}-daily-{stream}'
+      - 'xci-{phase}-{pod}-{distro}-daily-{stream}'
+
+# -------------------------------
+# job templates
+# -------------------------------
+- job-template:
+    name: 'xci-{scenario}-{pod}-{distro}-daily-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    properties:
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '^xci-os.*'
+            - '^xci-deploy.*'
+            - '^xci-functest.*'
+            - '^bifrost-.*periodic.*'
+            - '^osa-.*periodic.*'
+          block-level: 'NODE'
+      - logrotate-default
+
+    parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
+      - string:
+          name: XCI_FLAVOR
+          default: '{xci-flavor}'
+      - label:
+          name: SLAVE_LABEL
+          default: '{slave-label}'
+      - string:
+          name: CI_LOOP
+          default: 'daily'
+
+    triggers:
+      - '{auto-trigger-name}'
+
+    wrappers:
+      - fix-workspace-permissions
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - trigger-builds:
+          - project: 'xci-deploy-{pod}-{distro}-daily-{stream}'
+            current-parameters: false
+            predefined-parameters: |
+              DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              XCI_FLAVOR=$XCI_FLAVOR
+              CI_LOOP=$CI_LOOP
+            same-node: true
+            block: true
+      - trigger-builds:
+          - project: 'xci-functest-{pod}-{distro}-daily-{stream}'
+            current-parameters: false
+            predefined-parameters: |
+              DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              XCI_FLAVOR=$XCI_FLAVOR
+              CI_LOOP=$CI_LOOP
+            same-node: true
+            block: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
+
+    publishers:
+      # yamllint disable rule:line-length
+      - email:
+          recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com julienjut@gmail.com
+      # yamllint enable rule:line-length
+      - email-jenkins-admins-on-failure
+      - postbuildscript:
+          script-only-if-succeeded: false
+          script-only-if-failed: false
+          builders:
+            - shell:
+                !include-raw: ./xci-cleanup.sh
+
+- job-template:
+    name: 'xci-{phase}-{pod}-{distro}-daily-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    properties:
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '^xci-deploy.*'
+            - '^xci-functest.*'
+            - '^bifrost-.*periodic.*'
+            - '^osa-.*periodic.*'
+          block-level: 'NODE'
+      - logrotate-default
+
+    wrappers:
+      - fix-workspace-permissions
+
+    scm:
+      - git-scm
+
+    parameters:
+      - project-parameter:
+          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:
+          name: XCI_FLAVOR
+          default: 'ha'
+      - string:
+          name: DISTRO
+          default: '{distro}'
+      - string:
+          name: DIB_OS_RELEASE
+          default: '{dib-os-release}'
+      - string:
+          name: DIB_OS_ELEMENT
+          default: '{dib-os-element}'
+      - string:
+          name: DIB_OS_PACKAGES
+          default: '{dib-os-packages}'
+      - string:
+          name: EXTRA_DIB_ELEMENTS
+          default: '{extra-dib-elements}'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - label:
+          name: SLAVE_LABEL
+          default: '{slave-label}'
+      - string:
+          name: CI_LOOP
+          default: 'daily'
+      - string:
+          name: INSTALLER_TYPE
+          default: 'osa'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'daily'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'daily'
+          description: "Daily suite name to run"
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
+      - 'xci-{phase}-builder'
+
+# --------------------------
+# builder macros
+# --------------------------
+- builder:
+    name: xci-deploy-builder
+    builders:
+      - shell:
+          !include-raw: ./xci-deploy.sh
+
+- builder:
+    name: xci-functest-builder
+    builders:
+      - shell: |
+          #!/bin/bash
+
+          echo "Hello World!"
+
+# this will be enabled once the xci is prepared
+# - builder:
+#    name: xci-functest-builder
+#    builders:
+#        - shell:
+#            !include-raw:
+#                - ../../utils/fetch_os_creds.sh
+#                - ../functest/functest-alpine.sh
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
deleted file mode 100644
index 11db4e168..000000000
--- a/jjb/xci/xci-daily-jobs.yml
+++ /dev/null
@@ -1,265 +0,0 @@
----
-# -------------------------------
-# These jobs run on a daily basis and deploy OpenStack
-# using the pinned versions of opnfv/releng, openstack/bifrost
-# and openstack/openstack-ansible. Due to this, there is no
-# version/branch is set/passed to jobs and instead the versions
-# are checked out based on what is configured.
-# -------------------------------
-- project:
-    project: 'releng-xci'
-
-    name: 'xci-daily'
-    # -------------------------------
-    # Branch Anchors
-    # -------------------------------
-    master: &master
-      stream: master
-      opnfv-releng-version: master
-      gs-pathname: ''
-    # -------------------------------
-    # Scenarios
-    # -------------------------------
-    scenario:
-      - 'os-nosdn-nofeature-ha':
-          auto-trigger-name: 'daily-trigger-disabled'
-          xci-flavor: 'ha'
-      - 'os-nosdn-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
-          xci-flavor: 'noha'
-      - 'os-odl-sfc-ha':
-          auto-trigger-name: 'daily-trigger-disabled'
-          xci-flavor: 'ha'
-      - 'os-odl-sfc-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
-          xci-flavor: 'noha'
-    # -------------------------------
-    # XCI PODs
-    # -------------------------------
-    pod:
-      - virtual:
-          <<: *master
-    # -------------------------------
-    # Supported Distros
-    # -------------------------------
-    distro:
-      - 'xenial':
-          disabled: false
-          slave-label: xci-xenial-virtual
-          dib-os-release: 'xenial'
-          dib-os-element: 'ubuntu-minimal'
-          # yamllint disable rule:line-length
-          dib-os-packages: 'vlan,vim,less,bridge-utils,sudo,language-pack-en,iputils-ping,rsyslog,curl,python,debootstrap,ifenslave,ifenslave-2.6,lsof,lvm2,tcpdump,nfs-kernel-server,chrony,iptabls'
-          # yamllint enable rule:line-length
-          extra-dib-elements: 'openssh-server'
-      - 'centos7':
-          disabled: true
-          slave-label: xci-centos7-virtual
-          dib-os-release: '7'
-          dib-os-element: 'centos7'
-          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
-          extra-dib-elements: 'openssh-server'
-      - 'suse':
-          disabled: true
-          slave-label: xci-suse-virtual
-          dib-os-release: '42.3'
-          dib-os-element: 'opensuse-minimal'
-          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
-          extra-dib-elements: 'openssh-server'
-
-    # -------------------------------
-    #        Phases
-    # -------------------------------
-    phase:
-      - 'deploy'
-      - 'functest'
-    # -------------------------------
-    # jobs
-    # -------------------------------
-    jobs:
-      - 'xci-{scenario}-{pod}-{distro}-daily-{stream}'
-      - 'xci-{phase}-{pod}-{distro}-daily-{stream}'
-
-# -------------------------------
-# job templates
-# -------------------------------
-- job-template:
-    name: 'xci-{scenario}-{pod}-{distro}-daily-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    properties:
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '^xci-os.*'
-            - '^xci-deploy.*'
-            - '^xci-functest.*'
-            - '^bifrost-.*periodic.*'
-            - '^osa-.*periodic.*'
-          block-level: 'NODE'
-      - logrotate-default
-
-    parameters:
-      - string:
-          name: DEPLOY_SCENARIO
-          default: '{scenario}'
-      - string:
-          name: XCI_FLAVOR
-          default: '{xci-flavor}'
-      - label:
-          name: SLAVE_LABEL
-          default: '{slave-label}'
-      - string:
-          name: CI_LOOP
-          default: 'daily'
-
-    triggers:
-      - '{auto-trigger-name}'
-
-    wrappers:
-      - fix-workspace-permissions
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - trigger-builds:
-          - project: 'xci-deploy-{pod}-{distro}-daily-{stream}'
-            current-parameters: false
-            predefined-parameters: |
-              DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              XCI_FLAVOR=$XCI_FLAVOR
-              CI_LOOP=$CI_LOOP
-            same-node: true
-            block: true
-      - trigger-builds:
-          - project: 'xci-functest-{pod}-{distro}-daily-{stream}'
-            current-parameters: false
-            predefined-parameters: |
-              DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              XCI_FLAVOR=$XCI_FLAVOR
-              CI_LOOP=$CI_LOOP
-            same-node: true
-            block: true
-            block-thresholds:
-              build-step-failure-threshold: 'never'
-              failure-threshold: 'never'
-              unstable-threshold: 'FAILURE'
-
-    publishers:
-      # yamllint disable rule:line-length
-      - email:
-          recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com julienjut@gmail.com
-      # yamllint enable rule:line-length
-      - email-jenkins-admins-on-failure
-      - postbuildscript:
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          builders:
-            - shell:
-                !include-raw: ./xci-cleanup.sh
-
-- job-template:
-    name: 'xci-{phase}-{pod}-{distro}-daily-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    properties:
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '^xci-deploy.*'
-            - '^xci-functest.*'
-            - '^bifrost-.*periodic.*'
-            - '^osa-.*periodic.*'
-          block-level: 'NODE'
-      - logrotate-default
-
-    wrappers:
-      - fix-workspace-permissions
-
-    scm:
-      - git-scm
-
-    parameters:
-      - project-parameter:
-          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:
-          name: XCI_FLAVOR
-          default: 'ha'
-      - string:
-          name: DISTRO
-          default: '{distro}'
-      - string:
-          name: DIB_OS_RELEASE
-          default: '{dib-os-release}'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: '{dib-os-element}'
-      - string:
-          name: DIB_OS_PACKAGES
-          default: '{dib-os-packages}'
-      - string:
-          name: EXTRA_DIB_ELEMENTS
-          default: '{extra-dib-elements}'
-      - string:
-          name: CLEAN_DIB_IMAGES
-          default: 'true'
-      - label:
-          name: SLAVE_LABEL
-          default: '{slave-label}'
-      - string:
-          name: CI_LOOP
-          default: 'daily'
-      - string:
-          name: INSTALLER_TYPE
-          default: 'osa'
-      - string:
-          name: FUNCTEST_MODE
-          default: 'daily'
-      - string:
-          name: FUNCTEST_SUITE_NAME
-          default: 'daily'
-          description: "Daily suite name to run"
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-      - 'xci-{phase}-builder'
-
-# --------------------------
-# builder macros
-# --------------------------
-- builder:
-    name: xci-deploy-builder
-    builders:
-      - shell:
-          !include-raw: ./xci-deploy.sh
-
-- builder:
-    name: xci-functest-builder
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          echo "Hello World!"
-
-# this will be enabled once the xci is prepared
-# - builder:
-#    name: xci-functest-builder
-#    builders:
-#        - shell:
-#            !include-raw:
-#                - ../../utils/fetch_os_creds.sh
-#                - ../functest/functest-alpine.sh
diff --git a/jjb/xci/xci-merge-jobs.yaml b/jjb/xci/xci-merge-jobs.yaml
new file mode 100644
index 000000000..2d112c7e5
--- /dev/null
+++ b/jjb/xci/xci-merge-jobs.yaml
@@ -0,0 +1,470 @@
+---
+- project:
+    name: 'opnfv-xci-merge'
+
+    project: releng-xci
+    # -------------------------------
+    # branches
+    # -------------------------------
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+    # -------------------------------
+    # distros
+    # -------------------------------
+    distro:
+      - ubuntu:
+          disabled: false
+          kill-phase-on: FAILURE
+          abort-all-job: true
+      - centos:
+          disabled: true
+          kill-phase-on: NEVER
+          abort-all-job: false
+      - opensuse:
+          disabled: false
+          kill-phase-on: FAILURE
+          abort-all-job: true
+    # -------------------------------
+    # postmerge promotion phases
+    # -------------------------------
+    phase:
+      - 'deploy'
+      - 'healthcheck'
+    # -------------------------------
+    # jobs
+    # -------------------------------
+    jobs:
+      - 'xci-merge-virtual-{stream}'
+      - 'xci-merge-promote-virtual-{stream}'
+      - 'xci-merge-{distro}-virtual-{stream}'
+      - 'xci-merge-{distro}-{phase}-virtual-{stream}'
+# -------------------------------
+# job templates
+# -------------------------------
+- job-template:
+    name: 'xci-merge-virtual-{stream}'
+
+    project-type: multijob
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    properties:
+      - logrotate-default
+
+    wrappers:
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
+      - fix-workspace-permissions
+
+    scm:
+      - git-scm-gerrit
+
+    triggers:
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'releng-xci'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'false'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'xci/scripts/vm/**'
+                - compare-type: ANT
+                  pattern: 'docs/**'
+                - compare-type: ANT
+                  pattern: 'prototypes/**'
+                - compare-type: ANT
+                  pattern: 'upstream/**'
+                - compare-type: ANT
+                  pattern: 'INFO.yaml'
+            - project-compare-type: 'REG_EXP'
+              project-pattern: 'sfc|sdnvpn|releng-xci-scenarios'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'true'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'scenarios/**'
+          readable-message: true
+          custom-url: '* $JOB_NAME $BUILD_URL'
+
+    parameters:
+      - project-parameter:
+          project: $GERRIT_PROJECT
+          branch: '{branch}'
+      - label:
+          name: SLAVE_LABEL
+          default: 'xci-virtual'
+      - string:
+          name: CI_LOOP
+          default: 'merge'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'tier'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'healthcheck'
+      - string:
+          name: DISTRO
+          default: 'all'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+
+    builders:
+      - 'xci-merge-set-scenario-macro'
+      - inject:
+          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
+      - description-setter:
+          description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME"
+      - multijob:
+          name: deploy and test
+          condition: SUCCESSFUL
+          projects:
+            - name: 'xci-merge-opensuse-virtual-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                DISTRO=opensuse
+                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+                GERRIT_PROJECT=$GERRIT_PROJECT
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                CI_LOOP=$CI_LOOP
+                FUNCTEST_MODE=$FUNCTEST_MODE
+                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
+              node-parameters: false
+              kill-phase-on: FAILURE
+              abort-all-job: true
+            - name: 'xci-merge-ubuntu-virtual-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                DISTRO=ubuntu
+                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+                GERRIT_PROJECT=$GERRIT_PROJECT
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                CI_LOOP=$CI_LOOP
+                FUNCTEST_MODE=$FUNCTEST_MODE
+                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
+              node-parameters: false
+              kill-phase-on: FAILURE
+              abort-all-job: true
+            - name: 'xci-merge-centos-virtual-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                DISTRO=centos
+                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+                GERRIT_PROJECT=$GERRIT_PROJECT
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                CI_LOOP=$CI_LOOP
+                FUNCTEST_MODE=$FUNCTEST_MODE
+                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
+              node-parameters: false
+              kill-phase-on: NEVER
+              abort-all-job: false
+      - inject:
+          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
+      - multijob:
+          name: promote
+          condition: SUCCESSFUL
+          projects:
+            - name: 'xci-merge-promote-virtual-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                GERRIT_PROJECT=$GERRIT_PROJECT
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                CI_LOOP=$CI_LOOP
+                FUNCTEST_MODE=$FUNCTEST_MODE
+                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+
+- job-template:
+    name: 'xci-merge-{distro}-virtual-{stream}'
+
+    project-type: multijob
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'xci-verify-{distro}-.*'
+            - 'xci-merge-{distro}-.*'
+            - 'openstack-bifrost-verify-{distro}-.*'
+            - 'xci-osa-verify-{distro}-.*'
+            - 'xci-osa-periodic-{distro}-.*'
+          block-level: 'NODE'
+      - throttle:
+          max-per-node: 1
+          max-total: 3
+          categories:
+            - xci-verify-virtual
+          option: category
+
+    wrappers:
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
+      - fix-workspace-permissions
+
+    scm:
+      - git-scm-gerrit
+
+    parameters:
+      - project-parameter:
+          project: $GERRIT_PROJECT
+          branch: '{branch}'
+      - label:
+          name: SLAVE_LABEL
+          default: 'xci-virtual'
+      - string:
+          name: CI_LOOP
+          default: 'merge'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'tier'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'healthcheck'
+      - string:
+          name: DISTRO
+          default: '{distro}'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+
+    builders:
+      - 'xci-merge-set-scenario-macro'
+      - inject:
+          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
+      - description-setter:
+          description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME"
+      - multijob:
+          name: deploy
+          condition: SUCCESSFUL
+          projects:
+            - name: 'xci-merge-{distro}-deploy-virtual-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                DISTRO={distro}
+                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+                GERRIT_PROJECT=$GERRIT_PROJECT
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              node-parameters: true
+              kill-phase-on: '{kill-phase-on}'
+              abort-all-job: '{abort-all-job}'
+      - multijob:
+          name: healthcheck
+          condition: SUCCESSFUL
+          projects:
+            - name: 'xci-merge-{distro}-healthcheck-virtual-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                DISTRO={distro}
+                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+                GERRIT_PROJECT=$GERRIT_PROJECT
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                CI_LOOP=$CI_LOOP
+                FUNCTEST_MODE=$FUNCTEST_MODE
+                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
+              node-parameters: true
+              kill-phase-on: '{kill-phase-on}'
+              abort-all-job: '{abort-all-job}'
+
+    publishers:
+      - postbuildscript:
+          script-only-if-succeeded: false
+          script-only-if-failed: false
+          builders:
+            - shell:
+                !include-raw: ./xci-cleanup.sh
+
+- job-template:
+    name: 'xci-merge-{distro}-{phase}-virtual-{stream}'
+
+    disabled: false
+
+    concurrent: false
+
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '.*-bifrost-verify-.*'
+            - '.*-bifrost-periodic-.*'
+            - 'osa-verify-.*'
+            - 'osa-periodic-.*'
+          block-level: 'NODE'
+
+    parameters:
+      - string:
+          name: PROJECT
+          default: $GERRIT_PROJECT
+      - string:
+          name: DISTRO
+          default: 'ubuntu'
+      - string:
+          name: CI_LOOP
+          default: 'merge'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'tier'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'healthcheck'
+      - string:
+          name: XCI_FLAVOR
+          default: 'mini'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - string:
+          name: OPNFV_RELENG_DEV_PATH
+          default: $WORKSPACE/
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+
+    wrappers:
+      - inject:
+          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
+      - fix-workspace-permissions
+
+    scm:
+      - git-scm-gerrit
+
+    builders:
+      - description-setter:
+          description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME"
+      - 'xci-merge-{phase}-macro'
+
+- job-template:
+    name: 'xci-merge-promote-virtual-{stream}'
+
+    disabled: false
+
+    concurrent: false
+
+    properties:
+      - logrotate-default
+
+    parameters:
+      - string:
+          name: PROJECT
+          default: $GERRIT_PROJECT
+      - string:
+          name: CI_LOOP
+          default: 'merge'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'tier'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'healthcheck'
+      - string:
+          name: DISTRO
+          default: 'all'
+      - string:
+          name: OPNFV_RELENG_DEV_PATH
+          default: $WORKSPACE/
+      - string:
+          name: LOCAL_PROMOTION_METADATA_FILE
+          default: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
+      - string:
+          name: REMOTE_PROMOTION_METADATA_FILE
+          default: "gs://artifacts.opnfv.org/xci/pipeline/merge/$DEPLOY_SCENARIO.properties"
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+
+    wrappers:
+      - inject:
+          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
+      - fix-workspace-permissions
+
+    builders:
+      - description-setter:
+          description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME"
+      - 'xci-merge-promote-macro'
+
+# -------------------------------
+# builder macros
+# -------------------------------
+- builder:
+    name: 'xci-merge-set-scenario-macro'
+    builders:
+      - shell:
+          !include-raw: ./xci-set-scenario.sh
+
+- builder:
+    name: 'xci-merge-deploy-macro'
+    builders:
+      - shell:
+          !include-raw: ./xci-start-new-vm.sh
+
+      - shell:
+          !include-raw: ./xci-start-deployment.sh
+
+- builder:
+    name: 'xci-merge-healthcheck-macro'
+    builders:
+      - shell:
+          !include-raw: ./xci-run-functest.sh
+
+- builder:
+    name: 'xci-merge-promote-macro'
+    builders:
+      - shell:
+          !include-raw: ./xci-promote.sh
diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
deleted file mode 100644
index 2d112c7e5..000000000
--- a/jjb/xci/xci-merge-jobs.yml
+++ /dev/null
@@ -1,470 +0,0 @@
----
-- project:
-    name: 'opnfv-xci-merge'
-
-    project: releng-xci
-    # -------------------------------
-    # branches
-    # -------------------------------
-    stream:
-      - master:
-          branch: '{stream}'
-          disabled: false
-    # -------------------------------
-    # distros
-    # -------------------------------
-    distro:
-      - ubuntu:
-          disabled: false
-          kill-phase-on: FAILURE
-          abort-all-job: true
-      - centos:
-          disabled: true
-          kill-phase-on: NEVER
-          abort-all-job: false
-      - opensuse:
-          disabled: false
-          kill-phase-on: FAILURE
-          abort-all-job: true
-    # -------------------------------
-    # postmerge promotion phases
-    # -------------------------------
-    phase:
-      - 'deploy'
-      - 'healthcheck'
-    # -------------------------------
-    # jobs
-    # -------------------------------
-    jobs:
-      - 'xci-merge-virtual-{stream}'
-      - 'xci-merge-promote-virtual-{stream}'
-      - 'xci-merge-{distro}-virtual-{stream}'
-      - 'xci-merge-{distro}-{phase}-virtual-{stream}'
-# -------------------------------
-# job templates
-# -------------------------------
-- job-template:
-    name: 'xci-merge-virtual-{stream}'
-
-    project-type: multijob
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    properties:
-      - logrotate-default
-
-    wrappers:
-      - ssh-agent-wrapper
-      - build-timeout:
-          timeout: 240
-      - fix-workspace-permissions
-
-    scm:
-      - git-scm-gerrit
-
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'remerge'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'releng-xci'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              disable-strict-forbidden-file-verification: 'false'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'xci/scripts/vm/**'
-                - compare-type: ANT
-                  pattern: 'docs/**'
-                - compare-type: ANT
-                  pattern: 'prototypes/**'
-                - compare-type: ANT
-                  pattern: 'upstream/**'
-                - compare-type: ANT
-                  pattern: 'INFO.yaml'
-            - project-compare-type: 'REG_EXP'
-              project-pattern: 'sfc|sdnvpn|releng-xci-scenarios'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              disable-strict-forbidden-file-verification: 'true'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'scenarios/**'
-          readable-message: true
-          custom-url: '* $JOB_NAME $BUILD_URL'
-
-    parameters:
-      - project-parameter:
-          project: $GERRIT_PROJECT
-          branch: '{branch}'
-      - label:
-          name: SLAVE_LABEL
-          default: 'xci-virtual'
-      - string:
-          name: CI_LOOP
-          default: 'merge'
-      - string:
-          name: FUNCTEST_MODE
-          default: 'tier'
-      - string:
-          name: FUNCTEST_SUITE_NAME
-          default: 'healthcheck'
-      - string:
-          name: DISTRO
-          default: 'all'
-      - string:
-          name: CLEAN_DIB_IMAGES
-          default: 'true'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-    builders:
-      - 'xci-merge-set-scenario-macro'
-      - inject:
-          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
-      - description-setter:
-          description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME"
-      - multijob:
-          name: deploy and test
-          condition: SUCCESSFUL
-          projects:
-            - name: 'xci-merge-opensuse-virtual-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DISTRO=opensuse
-                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
-                GERRIT_PROJECT=$GERRIT_PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                CI_LOOP=$CI_LOOP
-                FUNCTEST_MODE=$FUNCTEST_MODE
-                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-            - name: 'xci-merge-ubuntu-virtual-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DISTRO=ubuntu
-                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
-                GERRIT_PROJECT=$GERRIT_PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                CI_LOOP=$CI_LOOP
-                FUNCTEST_MODE=$FUNCTEST_MODE
-                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-            - name: 'xci-merge-centos-virtual-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DISTRO=centos
-                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
-                GERRIT_PROJECT=$GERRIT_PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                CI_LOOP=$CI_LOOP
-                FUNCTEST_MODE=$FUNCTEST_MODE
-                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
-              node-parameters: false
-              kill-phase-on: NEVER
-              abort-all-job: false
-      - inject:
-          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
-      - multijob:
-          name: promote
-          condition: SUCCESSFUL
-          projects:
-            - name: 'xci-merge-promote-virtual-{stream}'
-              current-parameters: true
-              predefined-parameters: |
-                GERRIT_PROJECT=$GERRIT_PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                CI_LOOP=$CI_LOOP
-                FUNCTEST_MODE=$FUNCTEST_MODE
-                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
-              node-parameters: true
-              kill-phase-on: NEVER
-              abort-all-job: true
-
-- job-template:
-    name: 'xci-merge-{distro}-virtual-{stream}'
-
-    project-type: multijob
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    properties:
-      - logrotate-default
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'xci-verify-{distro}-.*'
-            - 'xci-merge-{distro}-.*'
-            - 'openstack-bifrost-verify-{distro}-.*'
-            - 'xci-osa-verify-{distro}-.*'
-            - 'xci-osa-periodic-{distro}-.*'
-          block-level: 'NODE'
-      - throttle:
-          max-per-node: 1
-          max-total: 3
-          categories:
-            - xci-verify-virtual
-          option: category
-
-    wrappers:
-      - ssh-agent-wrapper
-      - build-timeout:
-          timeout: 240
-      - fix-workspace-permissions
-
-    scm:
-      - git-scm-gerrit
-
-    parameters:
-      - project-parameter:
-          project: $GERRIT_PROJECT
-          branch: '{branch}'
-      - label:
-          name: SLAVE_LABEL
-          default: 'xci-virtual'
-      - string:
-          name: CI_LOOP
-          default: 'merge'
-      - string:
-          name: FUNCTEST_MODE
-          default: 'tier'
-      - string:
-          name: FUNCTEST_SUITE_NAME
-          default: 'healthcheck'
-      - string:
-          name: DISTRO
-          default: '{distro}'
-      - string:
-          name: CLEAN_DIB_IMAGES
-          default: 'true'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-    builders:
-      - 'xci-merge-set-scenario-macro'
-      - inject:
-          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
-      - description-setter:
-          description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME"
-      - multijob:
-          name: deploy
-          condition: SUCCESSFUL
-          projects:
-            - name: 'xci-merge-{distro}-deploy-virtual-{stream}'
-              current-parameters: true
-              predefined-parameters: |
-                DISTRO={distro}
-                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
-                GERRIT_PROJECT=$GERRIT_PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: true
-              kill-phase-on: '{kill-phase-on}'
-              abort-all-job: '{abort-all-job}'
-      - multijob:
-          name: healthcheck
-          condition: SUCCESSFUL
-          projects:
-            - name: 'xci-merge-{distro}-healthcheck-virtual-{stream}'
-              current-parameters: true
-              predefined-parameters: |
-                DISTRO={distro}
-                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
-                GERRIT_PROJECT=$GERRIT_PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                CI_LOOP=$CI_LOOP
-                FUNCTEST_MODE=$FUNCTEST_MODE
-                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
-              node-parameters: true
-              kill-phase-on: '{kill-phase-on}'
-              abort-all-job: '{abort-all-job}'
-
-    publishers:
-      - postbuildscript:
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          builders:
-            - shell:
-                !include-raw: ./xci-cleanup.sh
-
-- job-template:
-    name: 'xci-merge-{distro}-{phase}-virtual-{stream}'
-
-    disabled: false
-
-    concurrent: false
-
-    properties:
-      - logrotate-default
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '.*-bifrost-verify-.*'
-            - '.*-bifrost-periodic-.*'
-            - 'osa-verify-.*'
-            - 'osa-periodic-.*'
-          block-level: 'NODE'
-
-    parameters:
-      - string:
-          name: PROJECT
-          default: $GERRIT_PROJECT
-      - string:
-          name: DISTRO
-          default: 'ubuntu'
-      - string:
-          name: CI_LOOP
-          default: 'merge'
-      - string:
-          name: FUNCTEST_MODE
-          default: 'tier'
-      - string:
-          name: FUNCTEST_SUITE_NAME
-          default: 'healthcheck'
-      - string:
-          name: XCI_FLAVOR
-          default: 'mini'
-      - string:
-          name: CLEAN_DIB_IMAGES
-          default: 'true'
-      - string:
-          name: OPNFV_RELENG_DEV_PATH
-          default: $WORKSPACE/
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-    wrappers:
-      - inject:
-          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
-      - ssh-agent-wrapper
-      - build-timeout:
-          timeout: 240
-      - fix-workspace-permissions
-
-    scm:
-      - git-scm-gerrit
-
-    builders:
-      - description-setter:
-          description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME"
-      - 'xci-merge-{phase}-macro'
-
-- job-template:
-    name: 'xci-merge-promote-virtual-{stream}'
-
-    disabled: false
-
-    concurrent: false
-
-    properties:
-      - logrotate-default
-
-    parameters:
-      - string:
-          name: PROJECT
-          default: $GERRIT_PROJECT
-      - string:
-          name: CI_LOOP
-          default: 'merge'
-      - string:
-          name: FUNCTEST_MODE
-          default: 'tier'
-      - string:
-          name: FUNCTEST_SUITE_NAME
-          default: 'healthcheck'
-      - string:
-          name: DISTRO
-          default: 'all'
-      - string:
-          name: OPNFV_RELENG_DEV_PATH
-          default: $WORKSPACE/
-      - string:
-          name: LOCAL_PROMOTION_METADATA_FILE
-          default: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
-      - string:
-          name: REMOTE_PROMOTION_METADATA_FILE
-          default: "gs://artifacts.opnfv.org/xci/pipeline/merge/$DEPLOY_SCENARIO.properties"
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-    wrappers:
-      - inject:
-          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
-      - ssh-agent-wrapper
-      - build-timeout:
-          timeout: 240
-      - fix-workspace-permissions
-
-    builders:
-      - description-setter:
-          description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME"
-      - 'xci-merge-promote-macro'
-
-# -------------------------------
-# builder macros
-# -------------------------------
-- builder:
-    name: 'xci-merge-set-scenario-macro'
-    builders:
-      - shell:
-          !include-raw: ./xci-set-scenario.sh
-
-- builder:
-    name: 'xci-merge-deploy-macro'
-    builders:
-      - shell:
-          !include-raw: ./xci-start-new-vm.sh
-
-      - shell:
-          !include-raw: ./xci-start-deployment.sh
-
-- builder:
-    name: 'xci-merge-healthcheck-macro'
-    builders:
-      - shell:
-          !include-raw: ./xci-run-functest.sh
-
-- builder:
-    name: 'xci-merge-promote-macro'
-    builders:
-      - shell:
-          !include-raw: ./xci-promote.sh
diff --git a/jjb/xci/xci-verify-jobs.yaml b/jjb/xci/xci-verify-jobs.yaml
new file mode 100644
index 000000000..3b7df62f4
--- /dev/null
+++ b/jjb/xci/xci-verify-jobs.yaml
@@ -0,0 +1,303 @@
+---
+- project:
+    name: 'opnfv-xci-verify'
+
+    project: releng-xci
+    # -------------------------------
+    # branches
+    # -------------------------------
+    stream:
+      - master:
+          branch: '{stream}'
+    # -------------------------------
+    # distros
+    # -------------------------------
+    distro:
+      - ubuntu:
+          disabled: false
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
+      - centos:
+          disabled: false
+          successful: true
+          failed: true
+          unstable: true
+          notbuilt: true
+      - opensuse:
+          disabled: false
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
+    # -------------------------------
+    # type
+    # -------------------------------
+    type:
+      - virtual
+    # -------------------------------
+    # patch verification phases
+    # -------------------------------
+    phase:
+      - 'deploy'
+      - 'healthcheck'
+    # -------------------------------
+    # jobs
+    # -------------------------------
+    jobs:
+      - 'xci-verify-{distro}-{type}-{stream}'
+      - 'xci-verify-{distro}-{phase}-{type}-{stream}'
+# -------------------------------
+# job templates
+# -------------------------------
+- job-template:
+    name: 'xci-verify-{distro}-{type}-{stream}'
+
+    project-type: multijob
+
+    disabled: '{obj:disabled}'
+
+    concurrent: true
+
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'xci-verify-{distro}-.*'
+            - 'xci-merge-{distro}-.*'
+            - 'openstack-bifrost-verify-{distro}-.*'
+            - 'xci-osa-verify-{distro}-.*'
+            - 'xci-osa-periodic-{distro}-.*'
+          block-level: 'NODE'
+      - throttle:
+          max-per-node: 2
+          max-total: 10
+          categories:
+            - xci-verify-virtual
+          option: category
+
+    wrappers:
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
+      - fix-workspace-permissions
+
+    scm:
+      - git-scm-gerrit
+
+    triggers:
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'true'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'releng-xci'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'false'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'xci/scripts/vm/**'
+                - compare-type: ANT
+                  pattern: 'docs/**'
+                - compare-type: ANT
+                  pattern: 'prototypes/**'
+                - compare-type: ANT
+                  pattern: 'upstream/**'
+            - project-compare-type: 'REG_EXP'
+              project-pattern: 'sfc|sdnvpn|releng-xci-scenarios'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'true'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'scenarios/**'
+          readable-message: true
+          custom-url: '* $JOB_NAME $BUILD_URL'
+          skip-vote:
+            successful: '{obj:successful}'
+            failed: '{obj:failed}'
+            unstable: '{obj:unstable}'
+            notbuilt: '{obj:notbuilt}'
+
+    parameters:
+      - project-parameter:
+          project: $GERRIT_PROJECT
+          branch: '{branch}'
+      - label:
+          name: SLAVE_LABEL
+          default: 'xci-virtual'
+      - string:
+          name: DISTRO
+          default: '{distro}'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - string:
+          name: CI_LOOP
+          default: 'verify'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'tier'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'healthcheck'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+
+    builders:
+      - 'xci-verify-set-scenario-macro'
+      - inject:
+          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
+      - description-setter:
+          description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME"
+      - multijob:
+          name: deploy
+          condition: SUCCESSFUL
+          projects:
+            - name: 'xci-verify-{distro}-deploy-{type}-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                DISTRO={distro}
+                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+                GERRIT_PROJECT=$GERRIT_PROJECT
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                CI_LOOP=$CI_LOOP
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: healthcheck
+          condition: SUCCESSFUL
+          projects:
+            - name: 'xci-verify-{distro}-healthcheck-{type}-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                DISTRO={distro}
+                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+                GERRIT_PROJECT=$GERRIT_PROJECT
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                CI_LOOP=$CI_LOOP
+                FUNCTEST_MODE=$FUNCTEST_MODE
+                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+
+    publishers:
+      - postbuildscript:
+          script-only-if-succeeded: false
+          script-only-if-failed: false
+          builders:
+            - shell:
+                !include-raw: ./xci-cleanup.sh
+
+
+- job-template:
+    name: 'xci-verify-{distro}-{phase}-{type}-{stream}'
+
+    disabled: false
+
+    concurrent: true
+
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '.*-bifrost-verify-.*'
+            - '.*-bifrost-periodic-.*'
+            - 'osa-verify-.*'
+            - 'osa-periodic-.*'
+          block-level: 'NODE'
+
+    parameters:
+      - string:
+          name: PROJECT
+          default: $GERRIT_PROJECT
+      - string:
+          name: DISTRO
+          default: 'ubuntu'
+      - string:
+          name: CI_LOOP
+          default: 'verify'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'tier'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'healthcheck'
+      - string:
+          name: XCI_FLAVOR
+          default: 'mini'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - string:
+          name: OPNFV_RELENG_DEV_PATH
+          default: $WORKSPACE/
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+
+    wrappers:
+      - inject:
+          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
+      - fix-workspace-permissions
+
+    scm:
+      - git-scm-gerrit
+
+    builders:
+      - description-setter:
+          description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME"
+      - 'xci-verify-{phase}-macro'
+
+# -------------------------------
+# builder macros
+# -------------------------------
+- builder:
+    name: 'xci-verify-set-scenario-macro'
+    builders:
+      - shell:
+          !include-raw: ./xci-set-scenario.sh
+
+- builder:
+    name: 'xci-verify-deploy-macro'
+    builders:
+      - shell:
+          !include-raw: ./xci-start-new-vm.sh
+
+      - shell:
+          !include-raw: ./xci-start-deployment.sh
+
+- builder:
+    name: 'xci-verify-healthcheck-macro'
+    builders:
+      - shell:
+          !include-raw: ./xci-run-functest.sh
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
deleted file mode 100644
index 3b7df62f4..000000000
--- a/jjb/xci/xci-verify-jobs.yml
+++ /dev/null
@@ -1,303 +0,0 @@
----
-- project:
-    name: 'opnfv-xci-verify'
-
-    project: releng-xci
-    # -------------------------------
-    # branches
-    # -------------------------------
-    stream:
-      - master:
-          branch: '{stream}'
-    # -------------------------------
-    # distros
-    # -------------------------------
-    distro:
-      - ubuntu:
-          disabled: false
-          successful: false
-          failed: false
-          unstable: false
-          notbuilt: false
-      - centos:
-          disabled: false
-          successful: true
-          failed: true
-          unstable: true
-          notbuilt: true
-      - opensuse:
-          disabled: false
-          successful: false
-          failed: false
-          unstable: false
-          notbuilt: false
-    # -------------------------------
-    # type
-    # -------------------------------
-    type:
-      - virtual
-    # -------------------------------
-    # patch verification phases
-    # -------------------------------
-    phase:
-      - 'deploy'
-      - 'healthcheck'
-    # -------------------------------
-    # jobs
-    # -------------------------------
-    jobs:
-      - 'xci-verify-{distro}-{type}-{stream}'
-      - 'xci-verify-{distro}-{phase}-{type}-{stream}'
-# -------------------------------
-# job templates
-# -------------------------------
-- job-template:
-    name: 'xci-verify-{distro}-{type}-{stream}'
-
-    project-type: multijob
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'xci-verify-{distro}-.*'
-            - 'xci-merge-{distro}-.*'
-            - 'openstack-bifrost-verify-{distro}-.*'
-            - 'xci-osa-verify-{distro}-.*'
-            - 'xci-osa-periodic-{distro}-.*'
-          block-level: 'NODE'
-      - throttle:
-          max-per-node: 2
-          max-total: 10
-          categories:
-            - xci-verify-virtual
-          option: category
-
-    wrappers:
-      - ssh-agent-wrapper
-      - build-timeout:
-          timeout: 240
-      - fix-workspace-permissions
-
-    scm:
-      - git-scm-gerrit
-
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'true'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'releng-xci'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              disable-strict-forbidden-file-verification: 'false'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'xci/scripts/vm/**'
-                - compare-type: ANT
-                  pattern: 'docs/**'
-                - compare-type: ANT
-                  pattern: 'prototypes/**'
-                - compare-type: ANT
-                  pattern: 'upstream/**'
-            - project-compare-type: 'REG_EXP'
-              project-pattern: 'sfc|sdnvpn|releng-xci-scenarios'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              disable-strict-forbidden-file-verification: 'true'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'scenarios/**'
-          readable-message: true
-          custom-url: '* $JOB_NAME $BUILD_URL'
-          skip-vote:
-            successful: '{obj:successful}'
-            failed: '{obj:failed}'
-            unstable: '{obj:unstable}'
-            notbuilt: '{obj:notbuilt}'
-
-    parameters:
-      - project-parameter:
-          project: $GERRIT_PROJECT
-          branch: '{branch}'
-      - label:
-          name: SLAVE_LABEL
-          default: 'xci-virtual'
-      - string:
-          name: DISTRO
-          default: '{distro}'
-      - string:
-          name: CLEAN_DIB_IMAGES
-          default: 'true'
-      - string:
-          name: CI_LOOP
-          default: 'verify'
-      - string:
-          name: FUNCTEST_MODE
-          default: 'tier'
-      - string:
-          name: FUNCTEST_SUITE_NAME
-          default: 'healthcheck'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-    builders:
-      - 'xci-verify-set-scenario-macro'
-      - inject:
-          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
-      - description-setter:
-          description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME"
-      - multijob:
-          name: deploy
-          condition: SUCCESSFUL
-          projects:
-            - name: 'xci-verify-{distro}-deploy-{type}-{stream}'
-              current-parameters: true
-              predefined-parameters: |
-                DISTRO={distro}
-                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
-                GERRIT_PROJECT=$GERRIT_PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                CI_LOOP=$CI_LOOP
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: healthcheck
-          condition: SUCCESSFUL
-          projects:
-            - name: 'xci-verify-{distro}-healthcheck-{type}-{stream}'
-              current-parameters: true
-              predefined-parameters: |
-                DISTRO={distro}
-                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
-                GERRIT_PROJECT=$GERRIT_PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                CI_LOOP=$CI_LOOP
-                FUNCTEST_MODE=$FUNCTEST_MODE
-                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
-              node-parameters: true
-              kill-phase-on: NEVER
-              abort-all-job: true
-
-    publishers:
-      - postbuildscript:
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          builders:
-            - shell:
-                !include-raw: ./xci-cleanup.sh
-
-
-- job-template:
-    name: 'xci-verify-{distro}-{phase}-{type}-{stream}'
-
-    disabled: false
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '.*-bifrost-verify-.*'
-            - '.*-bifrost-periodic-.*'
-            - 'osa-verify-.*'
-            - 'osa-periodic-.*'
-          block-level: 'NODE'
-
-    parameters:
-      - string:
-          name: PROJECT
-          default: $GERRIT_PROJECT
-      - string:
-          name: DISTRO
-          default: 'ubuntu'
-      - string:
-          name: CI_LOOP
-          default: 'verify'
-      - string:
-          name: FUNCTEST_MODE
-          default: 'tier'
-      - string:
-          name: FUNCTEST_SUITE_NAME
-          default: 'healthcheck'
-      - string:
-          name: XCI_FLAVOR
-          default: 'mini'
-      - string:
-          name: CLEAN_DIB_IMAGES
-          default: 'true'
-      - string:
-          name: OPNFV_RELENG_DEV_PATH
-          default: $WORKSPACE/
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
-    wrappers:
-      - inject:
-          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
-      - ssh-agent-wrapper
-      - build-timeout:
-          timeout: 240
-      - fix-workspace-permissions
-
-    scm:
-      - git-scm-gerrit
-
-    builders:
-      - description-setter:
-          description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME"
-      - 'xci-verify-{phase}-macro'
-
-# -------------------------------
-# builder macros
-# -------------------------------
-- builder:
-    name: 'xci-verify-set-scenario-macro'
-    builders:
-      - shell:
-          !include-raw: ./xci-set-scenario.sh
-
-- builder:
-    name: 'xci-verify-deploy-macro'
-    builders:
-      - shell:
-          !include-raw: ./xci-start-new-vm.sh
-
-      - shell:
-          !include-raw: ./xci-start-deployment.sh
-
-- builder:
-    name: 'xci-verify-healthcheck-macro'
-    builders:
-      - shell:
-          !include-raw: ./xci-run-functest.sh
-- 
cgit 1.2.3-korg