diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x[-rw-r--r--] | jjb/functest/functest-daily-jobs.yml | 62 | ||||
| -rw-r--r-- | jjb/opera/opera-daily-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/opera/opera-verify-jobs.yml | 2 |
3 files changed, 22 insertions, 44 deletions
diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml index 84bdac6db..099d01a59 100644..100755 --- a/jjb/functest/functest-daily-jobs.yml +++ b/jjb/functest/functest-daily-jobs.yml @@ -249,32 +249,13 @@ builders: - description-setter: description: "Built on $NODE_NAME" - - conditional-step: - condition-kind: regex-match - regex: "os-*" - label: 'DEPLOY_SCENARIO' - steps: - - 'functest-{testsuite}-builder' - - conditional-step: - condition-kind: regex-match - regex: "k8-*" - label: 'DEPLOY_SCENARIO' - steps: - - 'functest-k8-builder' + - 'functest-{testsuite}-builder' ######################## # parameter macros ######################## - parameter: - name: functest-k8-parameter - parameters: - - string: - name: FUNCTEST_MODE - default: 'daily' - description: "Daily suite name to run on K8 deployment" - -- parameter: name: functest-daily-parameter parameters: - string: @@ -399,31 +380,28 @@ - 'functest-exit' - builder: - name: functest-k8-builder - builders: - - 'functest-cleanup' - - 'functest-daily-k8' - - 'functest-store-results' - - 'functest-exit' - -- builder: - name: functest-daily-k8 - builders: - # yamllint disable rule:indentation - - shell: - !include-raw: - - ../../utils/fetch_k8_conf.sh - - ./functest-k8.sh - -- builder: name: functest-daily builders: # yamllint disable rule:indentation - - shell: - !include-raw: - - ./functest-env-presetup.sh - - ../../utils/fetch_os_creds.sh - - ./functest-alpine.sh + - conditional-step: + condition-kind: regex-match + regex: "os-.*" + label: '$DEPLOY_SCENARIO' + steps: + - shell: + !include-raw: + - ./functest-env-presetup.sh + - ../../utils/fetch_os_creds.sh + - ./functest-alpine.sh + - conditional-step: + condition-kind: regex-match + regex: "k8-.*" + label: '$DEPLOY_SCENARIO' + steps: + - shell: + !include-raw: + - ../../utils/fetch_k8_conf.sh + - ./functest-k8.sh # yamllint enable rule:indentation - builder: diff --git a/jjb/opera/opera-daily-jobs.yml b/jjb/opera/opera-daily-jobs.yml index 5d7526bba..f0841a34b 100644 --- a/jjb/opera/opera-daily-jobs.yml +++ b/jjb/opera/opera-daily-jobs.yml @@ -11,7 +11,7 @@ stream: master branch: '{stream}' gs-pathname: '' - disabled: false + disabled: true ##################################### # pod definitions diff --git a/jjb/opera/opera-verify-jobs.yml b/jjb/opera/opera-verify-jobs.yml index ad93d4653..97c9a43ec 100644 --- a/jjb/opera/opera-verify-jobs.yml +++ b/jjb/opera/opera-verify-jobs.yml @@ -11,7 +11,7 @@ - master: branch: '{stream}' gs-pathname: '' - disabled: false + disabled: true ##################################### # patch verification phases |