Merge "Stabilize Zuul jobs"

This commit is contained in:
Zuul 2022-09-15 13:21:26 +00:00 committed by Gerrit Code Review
commit 1e5b5a83a7
16 changed files with 50 additions and 36 deletions

View File

@ -600,15 +600,21 @@
- release-notes-jobs-python3
check:
jobs:
- tacker-functional-devstack-multinode-legacy
- tacker-functional-devstack-multinode-legacy:
# TODO(ueha) Temporarily set to non-voting for Zed RC1
voting: false
- tacker-functional-devstack-multinode-sol
- tacker-functional-devstack-multinode-sol-separated-nfvo
- tacker-functional-devstack-multinode-sol-kubernetes
- tacker-functional-devstack-multinode-libs-master
- tacker-functional-devstack-multinode-libs-master:
# TODO(ueha): Temporarily set to non-voting for Zed RC1
voting: false
- tacker-functional-devstack-multinode-sol-v2
- tacker-functional-devstack-multinode-sol-separated-nfvo-v2
- tacker-functional-devstack-multinode-sol-kubernetes-v2
- tacker-functional-devstack-multinode-sol-multi-tenant
- tacker-functional-devstack-multinode-sol-kubernetes-multi-tenant
- tacker-functional-devstack-kubernetes-oidc-auth
- tacker-functional-devstack-kubernetes-oidc-auth:
# TODO(ueha): Temporarily set to non-voting for Zed RC1
voting: false
- tacker-compliance-devstack-multinode-sol

View File

@ -55,7 +55,7 @@ topology_template:
VDU1:
type: tosca.nodes.nfv.Vdu.Compute
properties:
name: vdu1
name: vdu1-update
description: kubernetes controller resource as VDU
vdu_profile:
min_number_of_instances: 1
@ -64,7 +64,7 @@ topology_template:
VDU2:
type: tosca.nodes.nfv.Vdu.Compute
properties:
name: vdu2
name: vdu2-update
description: kubernetes controller resource as VDU
vdu_profile:
min_number_of_instances: 1

View File

@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: vdu1
name: vdu1-update
spec:
replicas: 1
selector:

View File

@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: ReplicaSet
metadata:
name: vdu2
name: vdu2-update
spec:
replicas: 1
selector:

View File

@ -21,7 +21,7 @@ Hash: 5431163fcba979bcad5f77ef956a5a1cc2069ff0f3e13131ef8826fb7e8f039b
Name: Files/kubernetes/deployment.yaml
Content-Type: application/yaml
Algorithm: SHA-256
Hash: 290debe315bb5b098f73d63049ba850cc5df3723447637bddc1cabe3d0e151d7
Hash: 70ec5964857f31a730c54a20b74128b6376ed6379d7bbb2e875fd0becdb248ec
Name: Files/kubernetes/deployment_2.yaml
Content-Type: application/yaml
@ -51,7 +51,7 @@ Hash: 5e29e35c849b2b8677efe8d6ec8554d638481bd41b4705856382698d96bcb040
Name: Files/kubernetes/replicaset.yaml
Content-Type: application/yaml
Algorithm: SHA-256
Hash: 2d9e48ab5e1794bd9b220fcac75ec7f595d72e04ca287bab30a78748aa852c30
Hash: 933f8d8d3a85b3dfed1b2ea72270104fd8930894615792843a649bd82963fe07
Name: Files/kubernetes/secret_2.yaml
Content-Type: application/yaml

View File

@ -55,7 +55,7 @@ topology_template:
VDU1:
type: tosca.nodes.nfv.Vdu.Compute
properties:
name: vdu1
name: vdu1-update
description: kubernetes controller resource as VDU
vdu_profile:
min_number_of_instances: 1
@ -64,7 +64,7 @@ topology_template:
VDU2:
type: tosca.nodes.nfv.Vdu.Compute
properties:
name: vdu2
name: vdu2-update
description: kubernetes controller resource as VDU
vdu_profile:
min_number_of_instances: 1

View File

@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: vdu1
name: vdu1-update
spec:
replicas: 1
selector:

View File

@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: ReplicaSet
metadata:
name: vdu2
name: vdu2-update
spec:
replicas: 1
selector:

View File

@ -21,7 +21,7 @@ Hash: 289386c71936b758022646248bfd3af90e87e42e6bbf203a6e32cd70905806e6
Name: Files/kubernetes/deployment.yaml
Content-Type: application/yaml
Algorithm: SHA-256
Hash: 03b61e9646925ddf414489212736b7d799710b26dc70f96641c50e699f0a1d5f
Hash: 04c4901fbc6ba6d51400669923753d1c08d4d863582914a272f17aa6272b89fe
Name: Files/kubernetes/deployment_2.yaml
Content-Type: application/yaml
@ -51,7 +51,7 @@ Hash: 5e29e35c849b2b8677efe8d6ec8554d638481bd41b4705856382698d96bcb040
Name: Files/kubernetes/replicaset.yaml
Content-Type: application/yaml
Algorithm: SHA-256
Hash: 5ed8f7acab4ff3f2e32ac00c7d1bb981197877c654bed8e0a6d1b2f603cebf5b
Hash: bddb64d0014188a027be1618b0e85a4e6f4bfbd0e01b1072b1b0a44b3737809f
Name: Files/kubernetes/secret_1.yaml
Content-Type: application/yaml

View File

@ -44,7 +44,7 @@ topology_template:
VDU1:
type: tosca.nodes.nfv.Vdu.Compute
properties:
name: vdu1
name: vdu1-scale
description: kubernetes controller resource as VDU
vdu_profile:
min_number_of_instances: 1

View File

@ -44,7 +44,7 @@ topology_template:
VDU1:
type: tosca.nodes.nfv.Vdu.Compute
properties:
name: vdu1
name: vdu1-scale
description: kubernetes controller resource as VDU
vdu_profile:
min_number_of_instances: 1

View File

@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: vdu1
name: vdu1-scale
namespace: default
spec:
replicas: 1

View File

@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: ReplicaSet
metadata:
name: vdu1
name: vdu1-scale
namespace: default
spec:
replicas: 1

View File

@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: vdu1
name: vdu1-scale
namespace: default
spec:
selector:

View File

@ -6,14 +6,14 @@ Entry-Definitions: Definitions/helloworld3_top.vnfd.yaml
Name: Files/kubernetes/deployment_scale.yaml
Content-Type: application/yaml
Algorithm: SHA-256
Hash: 8f8c45d63880fe9190e49c42458bf40c6aa7752ec84049db1027389715e12840
Hash: fb3c7d1b0d227f2fdf210da1700f6fc3c365b2332f3c64459afe67c5f836c2c2
Name: Files/kubernetes/statefulset_scale.yaml
Content-Type: application/yaml
Algorithm: SHA-256
Hash: a9c35728419fb1e72ba73362fb17472afc63010a82ad4e3b84f3cf52161186e4
Hash: ebfdb834bd124a3843cf67184ab28fdb664c6f0226b30f6a2ef3451f80468af7
Name: Files/kubernetes/replicaset_scale.yaml
Content-Type: application/yaml
Algorithm: SHA-256
Hash: 6585f8e34425c3c5ffd5ca40a262acaea1ede7fc7caa9920e5af8deb2d8dd83c
Hash: b23fd1737efc787ba12f035844646139830f4f867e4393d0cd695944ae465baa

View File

@ -110,7 +110,8 @@ class VnfLcmKubernetesHelmTest(vnflcm_base.BaseVnfLcmKubernetesTest):
"helmchartfile_path": helmchartfile_path,
"helmreleasename": "vdu1",
"helmparameter": [
"service.port=8081"
"service.port=8081",
"service.type=NodePort"
]
},
{
@ -118,7 +119,10 @@ class VnfLcmKubernetesHelmTest(vnflcm_base.BaseVnfLcmKubernetesTest):
"helmreleasename": "vdu2",
"helmrepositoryname": "bitnami",
"helmchartname": "apache",
"exthelmrepo_url": "https://charts.bitnami.com/bitnami"
"exthelmrepo_url": "https://charts.bitnami.com/bitnami",
"helmparameter": [
"service.type=NodePort"
]
}
],
"helm_replica_values": {
@ -155,8 +159,8 @@ class VnfLcmKubernetesHelmTest(vnflcm_base.BaseVnfLcmKubernetesTest):
Input parameter includes VimConnectionInfo.extra fields
"""
vnf_instance_name = "cnf_with_helmchart"
vnf_instance_description = "cnf with helmchart"
vnf_instance_name = "cnf_with_helmchart_extra_input"
vnf_instance_description = "cnf with helmchart_extra_input"
helmchartfile_path = "Files/kubernetes/localhelm-0.1.0.tgz"
flavour_id = "helmchart"
inst_additional_param = {
@ -166,17 +170,21 @@ class VnfLcmKubernetesHelmTest(vnflcm_base.BaseVnfLcmKubernetesTest):
{
"exthelmchart": "false",
"helmchartfile_path": helmchartfile_path,
"helmreleasename": "vdu1",
"helmreleasename": "vdu1-extra",
"helmparameter": [
"service.port=8081"
"service.port=8081",
"service.type=NodePort"
]
},
{
"exthelmchart": "true",
"helmreleasename": "vdu2",
"helmrepositoryname": "bitnami",
"helmreleasename": "vdu2-extra",
"helmrepositoryname": "bitnami-extra",
"helmchartname": "apache",
"exthelmrepo_url": "https://charts.bitnami.com/bitnami"
"exthelmrepo_url": "https://charts.bitnami.com/bitnami",
"helmparameter": [
"service.type=NodePort"
]
}
],
"helm_replica_values": {
@ -185,14 +193,14 @@ class VnfLcmKubernetesHelmTest(vnflcm_base.BaseVnfLcmKubernetesTest):
},
"vdu_mapping": {
"VDU1": {
"name": "vdu1-localhelm",
"name": "vdu1-extra-localhelm",
"kind": "Deployment",
"helmreleasename": "vdu1"
"helmreleasename": "vdu1-extra"
},
"VDU2": {
"name": "vdu2-apache",
"name": "vdu2-extra-apache",
"kind": "Deployment",
"helmreleasename": "vdu2"
"helmreleasename": "vdu2-extra"
}
}
}