Code Review
/
infra
/
cicd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Enable scenario input for engine verify jobs
[infra/cicd.git]
/
jjb
/
cloud-infra
/
cloud-infra-verify-engine.yaml
diff --git
a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index e7f768195f6addebb748e1c90d95f40b9d79f810..25e55dd324be0fe45e9ec6756e397cdd828deab9 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/
jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@
-75,7
+75,7
@@
jobs:
- 'cloud-infra-verify-engine-{os}-{type}-{stream}'
jobs:
- 'cloud-infra-verify-engine-{os}-{type}-{stream}'
- - 'cloud-infra-verify-{os}-{phase}-{type}-{stream}'
+ - 'cloud-infra-verify-
engine-
{os}-{phase}-{type}-{stream}'
- job-template:
name: 'cloud-infra-verify-engine-{os}-{type}-{stream}'
- job-template:
name: 'cloud-infra-verify-engine-{os}-{type}-{stream}'
@@
-119,10
+119,6
@@
name: DIB_OS_ELEMENT
default: '{dib_os_element}'
description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
name: DIB_OS_ELEMENT
default: '{dib_os_element}'
description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
- - string:
- name: DEPLOY_SCENARIO
- default: 'k8-calico-nofeature'
- description: 'Scenario to deploy and test'
- string:
name: TEST_SUITE
default: 'healthcheck'
- string:
name: TEST_SUITE
default: 'healthcheck'
@@
-138,6
+134,7
@@
use-build-blocker: true
blocking-jobs:
- 'cloud-infra-verify-engine-{os}-.*'
use-build-blocker: true
blocking-jobs:
- 'cloud-infra-verify-engine-{os}-.*'
+ - 'cloud-infra-verify-scenario-{os}-.*'
- 'cloud-infra-periodic-engine-{os}-.*'
- 'cloud-infra-os-.*'
- 'cloud-infra-k8-.*'
- 'cloud-infra-periodic-engine-{os}-.*'
- 'cloud-infra-os-.*'
- 'cloud-infra-k8-.*'
@@
-165,11
+162,12
@@
files: '**'
builders:
files: '**'
builders:
+ - 'cloud-infra-determine-scenario-macro'
- multijob:
name: deploy
condition: SUCCESSFUL
projects:
- multijob:
name: deploy
condition: SUCCESSFUL
projects:
- - name: 'cloud-infra-verify-{os}-deploy-{type}-{stream}'
+ - name: 'cloud-infra-verify-
engine-
{os}-deploy-{type}-{stream}'
current-parameters: true
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
current-parameters: true
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
@@
-178,7
+176,6
@@
IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
DIB_OS_RELEASE=$DIB_OS_RELEASE
DIB_OS_ELEMENT=$DIB_OS_ELEMENT
IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
DIB_OS_RELEASE=$DIB_OS_RELEASE
DIB_OS_ELEMENT=$DIB_OS_ELEMENT
- DEPLOY_SCENARIO=$DEPLOY_SCENARIO
CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
@@
-192,7
+189,7
@@
name: functest
condition: SUCCESSFUL
projects:
name: functest
condition: SUCCESSFUL
projects:
- - name: 'cloud-infra-verify-{os}-functest-{type}-{stream}'
+ - name: 'cloud-infra-verify-
engine-
{os}-functest-{type}-{stream}'
current-parameters: true
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
current-parameters: true
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
@@
-201,7
+198,6
@@
IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
DIB_OS_RELEASE=$DIB_OS_RELEASE
DIB_OS_ELEMENT=$DIB_OS_ELEMENT
IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
DIB_OS_RELEASE=$DIB_OS_RELEASE
DIB_OS_ELEMENT=$DIB_OS_ELEMENT
- DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
TEST_SUITE=$TEST_SUITE
CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
@@
-214,7
+210,7
@@
abort-all-job: true
- job-template:
abort-all-job: true
- job-template:
- name: 'cloud-infra-verify-{os}-{phase}-{type}-{stream}'
+ name: 'cloud-infra-verify-
engine-
{os}-{phase}-{type}-{stream}'
disabled: false
disabled: false
@@
-251,10
+247,6
@@
name: DIB_OS_ELEMENT
default: 'ubuntu-minimal'
description: 'DIB OS Element to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
name: DIB_OS_ELEMENT
default: 'ubuntu-minimal'
description: 'DIB OS Element to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
- - string:
- name: DEPLOY_SCENARIO
- default: 'k8-calico-nofeature'
- description: 'Scenario to deploy and test'
- string:
name: TEST_FW
default: '{phase}'
- string:
name: TEST_FW
default: '{phase}'
@@
-283,6
+275,7
@@
refspec: $GERRIT_REFSPEC
builders:
refspec: $GERRIT_REFSPEC
builders:
+ - 'cloud-infra-determine-scenario-macro'
- 'cloud-infra-{phase}-macro'
# vim: set ts=2 sw=2 expandtab:
- 'cloud-infra-{phase}-macro'
# vim: set ts=2 sw=2 expandtab: