summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-09-08 15:04:33 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-09-08 15:17:41 +0200
commit1641bf59bdde4338f6a7d6992eeaa24a84d9f20e (patch)
tree9266b735721bc92262559ede25e1c5fac190ef5f /jjb
parent97e1a8c7a37e20598327fd9dd2c8d3798db2b0de (diff)
Create both master and stable jobs
Change-Id: I1d0497333bc0ab357ee469d70f65aecc5e1d2516 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/xtesting-ci.yaml15
1 files changed, 12 insertions, 3 deletions
diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml
index a3d1e2b9d..f5f513e66 100644
--- a/jjb/functest/xtesting-ci.yaml
+++ b/jjb/functest/xtesting-ci.yaml
@@ -17,7 +17,12 @@
sudo systemctl restart docker
sudo rm -rfv /data
sudo pip3 install ansible
- ansible-galaxy install -f collivier.xtesting
+ case {release} in
+ stable)
+ ansible-galaxy install -f collivier.xtesting ;;
+ *)
+ ansible-galaxy install -f git+https://github.com/collivier/ansible-role-xtesting.git,{release} ;;
+ esac
ansible-galaxy collection install -f -r ~/.ansible/roles/collivier.xtesting/requirements.yml
ansible-playbook -vvvv ~/.ansible/roles/collivier.xtesting/tests/{playbook}.yml
@@ -29,7 +34,7 @@
default: '{slave}'
- job-template:
- name: 'xtesting-ci-tests-{playbook}'
+ name: 'xtesting-ci-tests-{release}-{playbook}'
triggers:
- timed: '@daily'
parameters:
@@ -44,6 +49,7 @@
builders:
- xtesting-ci-tests:
playbook: '{playbook}'
+ release: '{release}'
- project:
name: xtesting-ci-tests
@@ -79,8 +85,11 @@
- k8s_gitlab_kind1
- k8s_gitlab_kind2
- k8s_gitlab_kind3
+ release:
+ - stable
+ - master
jobs:
- - 'xtesting-ci-tests-{playbook}'
+ - 'xtesting-ci-tests-{release}-{playbook}'
- view:
name: xtesting-ci