diff options
author | 2017-03-20 15:01:52 +0100 | |
---|---|---|
committer | 2017-03-20 22:31:42 +0100 | |
commit | a88b258312d3c858b1b1167dfd03a09a6e28cacd (patch) | |
tree | 247d1b20e1c68565f7497dff5289492f0fe2669e /jjb/xci/xci-daily-jobs.yml | |
parent | 6eff820d35e78a9d8ffb2d35cef50e5125179e36 (diff) |
xci: Enable VM provisioning using bifrost for daily runs
- create script to provision VMs (log upload is not enabled yet)
- remove leftover inventory files (baremetal.csv, baremetal.json)
- set BIFROST_INVENTORY_SOURCE as needed by stable/ocata
- rename playbook used during bifrost and adjust scripts using it
- remove puppet-infracloud stuff
Change-Id: I1c4412d0725c00ab9a1b3497e358d33998b4e7e6
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/xci/xci-daily-jobs.yml')
-rw-r--r-- | jjb/xci/xci-daily-jobs.yml | 48 |
1 files changed, 15 insertions, 33 deletions
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml index a71b9b783..c685aa974 100644 --- a/jjb/xci/xci-daily-jobs.yml +++ b/jjb/xci/xci-daily-jobs.yml @@ -5,11 +5,13 @@ #-------------------------------- master: &master stream: master - branch: '{stream}' + openstack-branch: '{stream}' + opnfv-branch: 'master' gs-pathname: '' ocata: &ocata stream: ocata - branch: 'stable/{stream}' + openstack-branch: 'stable/{stream}' + opnfv-branch: 'master' gs-pathname: '/{stream}' #-------------------------------- # scenarios @@ -55,21 +57,9 @@ # Phases #-------------------------------- phase: - - 'provision': - project: 'openstack' - project-repo: 'https://git.openstack.org/openstack/bifrost' - project-branch: '{branch}' - clone-location: '/opt/bifrost' - - 'deploy': - project: 'openstack' - project-repo: 'https://git.openstack.org/openstack/openstack-ansible' - project-branch: '{branch}' - clone-location: '/opt/openstack-ansible' - - 'functest': - project: 'opnfv' - project-repo: 'https://gerrit.opnfv.org/gerrit/functest' - project-branch: 'master' - clone-location: '/opt/functest' + - 'provision' + - 'deploy' + - 'functest' #-------------------------------- # jobs #-------------------------------- @@ -158,17 +148,17 @@ parameters: - string: - name: PROJECT - default: '{project}' + name: OPENSTACK_BRANCH + default: '{openstack-branch}' - string: - name: PROJECT_REPO - default: '{project-repo}' + name: OPNFV_BRANCH + default: '{opnfv-branch}' - string: - name: DEPLOY_SCENARIO - default: '{scenario}' + name: USE_PROMOTED_VERSIONS + default: 'true' - string: - name: CLONE_LOCATION - default: '{clone-location}' + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-ha' - string: name: DISTRO default: '{distro}' @@ -188,14 +178,6 @@ name: CLEAN_DIB_IMAGES default: 'true' - scm: - - git: - url: '$PROJECT_REPO' - branches: - - 'origin/{project-branch}' - wipe-workspace: true - timeout: 15 - builders: - description-setter: description: "Built on $NODE_NAME - Scenario: $DEPLOY_SCENARIO" |