From ed3d7f310efbad4094e924aa722978cb3ffa5ecb Mon Sep 17 00:00:00 2001 From: Jose Lausuch Date: Thu, 21 Sep 2017 16:32:27 +0200 Subject: [Functest] Support functest-suite with Alpine containers Updated all the jobs that use functest-suite. For single test cases, we need to know to which docker image the test belongs to. Change-Id: If7db231ccc891233423f2f2bc3aa5b95d048b30a Signed-off-by: Jose Lausuch --- jjb/xci/osa-periodic-jobs.yml | 6 +++++- jjb/xci/xci-daily-jobs.yml | 3 +++ jjb/xci/xci-verify-jobs.yml | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'jjb/xci') diff --git a/jjb/xci/osa-periodic-jobs.yml b/jjb/xci/osa-periodic-jobs.yml index 86910ac4f..048825e74 100644 --- a/jjb/xci/osa-periodic-jobs.yml +++ b/jjb/xci/osa-periodic-jobs.yml @@ -106,7 +106,8 @@ predefined-parameters: | DISTRO={distro} DEPLOY_SCENARIO=os-nosdn-nofeature-noha - FUNCTEST_SUITE_NAME=healthcheck + FUNCTEST_MODE=tier + FUNCTEST_TIER=healthcheck node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -158,6 +159,9 @@ - string: name: OPNFV_RELENG_DEV_PATH default: $WORKSPACE/releng-xci + - string: + name: FUNCTEST_MODE + default: 'tier' - string: name: FUNCTEST_SUITE_NAME default: 'healthcheck' diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml index 64659da40..7d95429da 100644 --- a/jjb/xci/xci-daily-jobs.yml +++ b/jjb/xci/xci-daily-jobs.yml @@ -214,6 +214,9 @@ - string: name: INSTALLER_TYPE default: 'osa' + - string: + name: FUNCTEST_MODE + default: 'daily' - string: name: FUNCTEST_SUITE_NAME default: 'daily' diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index 324bfd14c..440fac79f 100644 --- a/jjb/xci/xci-verify-jobs.yml +++ b/jjb/xci/xci-verify-jobs.yml @@ -145,7 +145,8 @@ DISTRO={distro} DEPLOY_SCENARIO=os-nosdn-nofeature-noha CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES - FUNCTEST_SUITE_NAME=healthcheck + FUNCTEST_MODE=tier + FUNCTEST_TIER=healthcheck node-parameters: true kill-phase-on: NEVER abort-all-job: true @@ -177,6 +178,9 @@ - string: name: DEPLOY_SCENARIO default: 'os-nosdn-nofeature-noha' + - string: + name: FUNCTEST_MODE + default: 'tier' - string: name: FUNCTEST_SUITE_NAME default: 'healthcheck' -- cgit