From deb23d940ad85684c15fbee077fd1bf4c5e372d6 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Mon, 22 Jan 2018 10:27:40 +0100 Subject: xci sfc: Enable post merge deployment This change enables the deployment upon merge of a change. Followup patches will incorporate functest smoke and promotion which the promotion will most likely be the first one as functest parts are a bit tricky due to failures while running testing in VMs. Apart from the enablement of the deployments, job concurrency is disabled as well since we should only test one change at a time and attempt promotion for any scenario in order to ensure we keep the promotion consistent. Change-Id: Ib4b5754b6b88f42eab83c656e03773c83068016f Signed-off-by: Fatih Degirmenci --- jjb/xci/xci-merge-jobs.yml | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'jjb/xci/xci-merge-jobs.yml') diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml index d96956e4a..df03a0428 100644 --- a/jjb/xci/xci-merge-jobs.yml +++ b/jjb/xci/xci-merge-jobs.yml @@ -52,7 +52,7 @@ disabled: '{obj:disabled}' - concurrent: true + concurrent: false properties: - logrotate-default @@ -66,12 +66,6 @@ - 'xci-osa-periodic-{distro}-.*' - 'xci-(os|k8s).*?-virtual-{distro}-.*' block-level: 'NODE' - - throttle: - max-per-node: 2 - max-total: 10 - categories: - - xci-verify-virtual - option: category wrappers: - ssh-agent-wrapper @@ -230,23 +224,21 @@ - builder: name: 'xci-merge-deploy-macro' builders: - - shell: | - #!/bin/bash - - echo "Hello World!" + - shell: + !include-raw: ./xci-start-new-vm.sh + - shell: + !include-raw: ./xci-start-deployment.sh - builder: name: 'xci-merge-healthcheck-macro' builders: - - shell: | - #!/bin/bash - - echo "Hello World!" + - shell: + !include-raw: ./xci-run-functest.sh + - shell: + !include-raw: ./xci-cleanup.sh - builder: name: 'xci-merge-promote-macro' builders: - - shell: | - #!/bin/bash - - echo "Hello World!" + - shell: + !include-raw: ./xci-promote.sh -- cgit 1.2.3-korg