From e977155378fcbbd0826fa4a192b25273648d3782 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Sat, 27 Aug 2016 00:25:37 +0200 Subject: Create daily job for infra deployment, remove sandbox jobs and fix bugs This change - creates upstream daily job to trigger and control the execution of jobs that provision nodes using bifrost, deployment using puppet-infracloud, and simple smoke test job. - fixes the hashbang placement in 2 of the scripts. - removes sandbox dummy jobs as the infra jobs can serve as examples now. Only the node provisioning job is functional at the moment. Change-Id: I311d159956d8b7ce3f7a500fac5a7dcb459104cf Signed-off-by: Fatih Degirmenci --- jjb/opnfv/installer-params.yml | 11 +++-------- jjb/opnfv/slave-params.yml | 10 ++++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'jjb/opnfv') diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index fbcaa4ba2..ec0b86170 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -89,19 +89,14 @@ name: CPU_ARCHITECTURE default: 'amd64' description: "CPU Architecture to use for Ubuntu distro " - - parameter: - name: 'sandbox-defaults' + name: 'infra-defaults' parameters: - string: name: INSTALLER_IP - default: '10.20.0.2' + default: '192.168.122.2' description: 'IP of the installer' - string: name: INSTALLER_TYPE - default: sandbox + default: infra description: 'Installer used for deploying OPNFV on this POD' - - string: - name: EXTERNAL_NETWORK - default: 'admin_floating_net' - description: 'external network for test' diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 73c7c61b5..59348e454 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -211,6 +211,16 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' +- parameter: + name: 'infra-virtual-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'infra-virtual' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' ##################################################### # Parameters for build slaves ##################################################### -- cgit 1.2.3-korg