summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/functest')
-rw-r--r--jjb/functest/functest-kubernetes-ng.yaml37
-rw-r--r--jjb/functest/functest-kubernetes.yaml23
-rw-r--r--jjb/functest/functest.yaml35
-rw-r--r--jjb/functest/xtesting.yaml1
4 files changed, 78 insertions, 18 deletions
diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index 3240eeba0..6f1cb328f 100644
--- a/jjb/functest/functest-kubernetes-ng.yaml
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -342,15 +342,44 @@
<<: *functest-kubernetes-ng-containers
- project:
- name: 'functest-kubernetes-ng-opnfv-xtesting-trivy'
+ name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-core-trivy'
<<: *functest-kubernetes-ng-params
- container: 'xtesting'
+ container: 'functest-kubernetes-core'
jobs:
- 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'
+
+- project:
+ name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-healthcheck-trivy'
+ <<: *functest-kubernetes-ng-params
+ container: 'functest-kubernetes-healthcheck'
+ jobs:
+ - 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'
+
+- project:
+ name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-cnf-trivy'
+ <<: *functest-kubernetes-ng-params
+ container: 'functest-kubernetes-cnf'
+ jobs:
+ - 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'
+
+- project:
+ name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-security-trivy'
+ <<: *functest-kubernetes-ng-params
+ container: 'functest-kubernetes-security'
+ jobs:
+ - 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'
+
+- project:
+ name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-smoke-trivy'
+ <<: *functest-kubernetes-ng-params
+ container: 'functest-kubernetes-smoke'
+ jobs:
+ - 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'
+
- project:
- name: 'functest-kubernetes-ng-opnfv-xtesting-mts-trivy'
+ name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-benchmarking-trivy'
<<: *functest-kubernetes-ng-params
- container: 'xtesting-mts'
+ container: 'functest-kubernetes-benchmarking'
jobs:
- 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 5c840b424..3fd45e43b 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -1008,33 +1008,44 @@
<<: *functest-kubernetes-containers
- project:
+ name: 'functest-kubernetes-opnfv-functest-kubernetes-core-trivy'
+ <<: *functest-kubernetes-params
+ container: 'functest-kubernetes-core'
+ jobs:
+ - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+
+- project:
name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-trivy'
<<: *functest-kubernetes-params
container: 'functest-kubernetes-healthcheck'
jobs:
- 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+
- project:
- name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-trivy'
+ name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-trivy'
<<: *functest-kubernetes-params
- container: 'functest-kubernetes-smoke'
+ container: 'functest-kubernetes-cnf'
jobs:
- 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+
- project:
name: 'functest-kubernetes-opnfv-functest-kubernetes-security-trivy'
<<: *functest-kubernetes-params
container: 'functest-kubernetes-security'
jobs:
- 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+
- project:
- name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-trivy'
+ name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-trivy'
<<: *functest-kubernetes-params
- container: 'functest-kubernetes-benchmarking'
+ container: 'functest-kubernetes-smoke'
jobs:
- 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+
- project:
- name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-trivy'
+ name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-trivy'
<<: *functest-kubernetes-params
- container: 'functest-kubernetes-cnf'
+ container: 'functest-kubernetes-benchmarking'
jobs:
- 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 5280d7bb3..d259f44e6 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -1360,39 +1360,58 @@
<<: *functest-containers
- project:
+ name: 'functest-opnfv-functest-core-trivy'
+ <<: *functest-params
+ container: 'functest-core'
+ jobs:
+ - 'functest-{repo}-{container}-{tag}-trivy'
+
+- project:
+ name: 'functest-opnfv-functest-tempest-trivy'
+ <<: *functest-params
+ container: 'functest-tempest'
+ jobs:
+ - 'functest-{repo}-{container}-{tag}-trivy'
+
+- project:
name: 'functest-opnfv-functest-healthcheck-trivy'
<<: *functest-params
container: 'functest-healthcheck'
jobs:
- 'functest-{repo}-{container}-{tag}-trivy'
+
- project:
name: 'functest-opnfv-functest-smoke-trivy'
<<: *functest-params
container: 'functest-smoke'
jobs:
- 'functest-{repo}-{container}-{tag}-trivy'
+
- project:
- name: 'functest-opnfv-functest-smoke-cntt-trivy'
+ name: 'functest-opnfv-functest-benchmarking-trivy'
<<: *functest-params
- container: 'functest-smoke-cntt'
+ container: 'functest-benchmarking'
jobs:
- 'functest-{repo}-{container}-{tag}-trivy'
+
- project:
- name: 'functest-opnfv-functest-benchmarking-trivy'
+ name: 'functest-opnfv-functest-vnf-trivy'
<<: *functest-params
- container: 'functest-benchmarking'
+ container: 'functest-vnf'
jobs:
- 'functest-{repo}-{container}-{tag}-trivy'
+
- project:
- name: 'functest-opnfv-functest-benchmarking-cntt-trivy'
+ name: 'functest-opnfv-functest-smoke-cntt-trivy'
<<: *functest-params
- container: 'functest-benchmarking-cntt'
+ container: 'functest-smoke-cntt'
jobs:
- 'functest-{repo}-{container}-{tag}-trivy'
+
- project:
- name: 'functest-opnfv-functest-vnf-trivy'
+ name: 'functest-opnfv-functest-benchmarking-cntt-trivy'
<<: *functest-params
- container: 'functest-vnf'
+ container: 'functest-benchmarking-cntt'
jobs:
- 'functest-{repo}-{container}-{tag}-trivy'
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index c596762db..c0c4bac90 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -736,6 +736,7 @@
container: 'xtesting'
jobs:
- 'xtesting-{repo}-{container}-{tag}-trivy'
+
- project:
name: 'xtesting-opnfv-xtesting-mts-trivy'
<<: *xtesting-params