summaryrefslogtreecommitdiffstats
path: root/jjb/xci
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-01-22 10:27:40 +0100
committerFatih Degirmenci <fdegir@gmail.com>2018-01-22 10:36:31 +0100
commitdeb23d940ad85684c15fbee077fd1bf4c5e372d6 (patch)
tree8a1678062b1e01504a57f85c32f7fff70b065b7c /jjb/xci
parent721fbb630acb5766e3835095290fe215ec1f9686 (diff)
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 <fdegir@gmail.com>
Diffstat (limited to 'jjb/xci')
-rw-r--r--jjb/xci/xci-merge-jobs.yml30
-rwxr-xr-xjjb/xci/xci-promote.sh23
2 files changed, 34 insertions, 19 deletions
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
diff --git a/jjb/xci/xci-promote.sh b/jjb/xci/xci-promote.sh
new file mode 100755
index 000000000..b16408963
--- /dev/null
+++ b/jjb/xci/xci-promote.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 Ericsson and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+#----------------------------------------------------------------------
+# This script is used by CI and executed by Jenkins jobs.
+# You are not supposed to use this script manually if you don't know
+# what you are doing.
+#----------------------------------------------------------------------
+
+# skip the healthcheck if the patch doesn't impact the deployment
+if [[ "$GERRIT_TOPIC" =~ skip-verify|skip-deployment ]]; then
+ echo "Skipping the healthcheck!"
+ exit 0
+fi
+
+echo "Hello World!"