Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Revert "Disable CNTT jobs""
[releng.git]
/
jjb
/
functest
/
functest-kubernetes-docker.yaml
diff --git
a/jjb/functest/functest-kubernetes-docker.yaml
b/jjb/functest/functest-kubernetes-docker.yaml
index
c8c55e7
..
21fbdb4
100644
(file)
--- a/
jjb/functest/functest-kubernetes-docker.yaml
+++ b/
jjb/functest/functest-kubernetes-docker.yaml
@@
-12,6
+12,9
@@
- master:
branch: '{stream}'
disabled: false
- master:
branch: '{stream}'
disabled: false
+ - jerma:
+ branch: 'stable/{stream}'
+ disabled: false
- iruya:
branch: 'stable/{stream}'
disabled: false
- iruya:
branch: 'stable/{stream}'
disabled: false
@@
-21,7
+24,7
@@
arch_tag:
- 'amd64':
arch_tag:
- 'amd64':
- slave_label: '
opnfv-build-ubuntu
'
+ slave_label: '
lf-build2
'
- 'arm64':
slave_label: 'opnfv-build-ubuntu-arm'
- 'arm64':
slave_label: 'opnfv-build-ubuntu-arm'
@@
-29,7
+32,6
@@
image:
- 'core'
- 'healthcheck'
image:
- 'core'
- 'healthcheck'
- - 'features'
- 'smoke'
# settings for jobs run in multijob phases
- 'smoke'
# settings for jobs run in multijob phases
@@
-74,7
+76,7
@@
- functest-kubernetes-job-parameters:
project: '{project}'
branch: '{branch}'
- functest-kubernetes-job-parameters:
project: '{project}'
branch: '{branch}'
- slave_label: '
opnfv-build-ubuntu
'
+ slave_label: '
lf-build2
'
arch_tag: 'amd64'
properties:
arch_tag: 'amd64'
properties:
@@
-125,10
+127,6
@@
condition: SUCCESSFUL
execution-type: PARALLEL
projects:
condition: SUCCESSFUL
execution-type: PARALLEL
projects:
- - name: 'functest-kubernetes-features-docker-build-amd64-{stream}'
- <<: *build-job-settings
- - name: 'functest-kubernetes-features-docker-build-arm64-{stream}'
- <<: *build-job-settings
- name: 'functest-kubernetes-smoke-docker-build-amd64-{stream}'
<<: *build-job-settings
- name: 'functest-kubernetes-smoke-docker-build-arm64-{stream}'
- name: 'functest-kubernetes-smoke-docker-build-amd64-{stream}'
<<: *build-job-settings
- name: 'functest-kubernetes-smoke-docker-build-arm64-{stream}'
@@
-138,8
+136,6
@@
condition: SUCCESSFUL
execution-type: PARALLEL
projects:
condition: SUCCESSFUL
execution-type: PARALLEL
projects:
- - name: 'functest-kubernetes-features-docker-manifest-{stream}'
- <<: *manifest-job-settings
- name: 'functest-kubernetes-smoke-docker-manifest-{stream}'
<<: *manifest-job-settings
- name: 'functest-kubernetes-smoke-docker-manifest-{stream}'
<<: *manifest-job-settings
@@
-178,7
+174,7
@@
branch: '{branch}'
- label:
name: SLAVE_LABEL
branch: '{branch}'
- label:
name: SLAVE_LABEL
- default: '
opnfv-build-ubuntu
'
+ default: '
lf-build2
'
description: 'Slave label on Jenkins'
all-nodes: false
node-eligibility: 'ignore-offline'
description: 'Slave label on Jenkins'
all-nodes: false
node-eligibility: 'ignore-offline'