summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/barometer/barometer.yaml1
-rw-r--r--jjb/functest/functest-kubernetes-ng.yaml426
-rw-r--r--jjb/functest/functest-kubernetes-pi.yaml44
-rw-r--r--jjb/functest/functest-kubernetes.yaml255
-rw-r--r--jjb/functest/functest-pi.yaml82
-rw-r--r--jjb/functest/functest.yaml319
-rw-r--r--jjb/functest/xtesting-pi.yaml44
-rw-r--r--jjb/functest/xtesting.yaml233
-rw-r--r--jjb/ovn4nfv/golang-make-test.sh25
-rw-r--r--jjb/ovn4nfv/ovn4nfv-k8s-plugins-project-jobs.yaml109
-rw-r--r--jjb/releng/artifact-cleanup.yaml3
11 files changed, 974 insertions, 567 deletions
diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml
index b01a89051..755eda897 100644
--- a/jjb/barometer/barometer.yaml
+++ b/jjb/barometer/barometer.yaml
@@ -165,6 +165,7 @@
- string:
name: BRANCH
default: '{branch}'
+ - opnfv-build-centos-defaults
triggers:
- timed: '@midnight'
diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
new file mode 100644
index 000000000..c447d5398
--- /dev/null
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -0,0 +1,426 @@
+---
+- functest-kubernetes-ng-containers: &functest-kubernetes-ng-containers
+ name: 'functest-kubernetes-ng-containers'
+ repo: '{repo}'
+ port: '{port}'
+ container: '{container}'
+ tag: '{tag}'
+
+- functest-kubernetes-ng-params: &functest-kubernetes-ng-params
+ name: 'functest-kubernetes-ng-params'
+ repo: 'opnfv'
+ port:
+ tag:
+ - v1.20:
+ buildargs:
+ branch: stable/leguer
+ slave: lf-virtual1
+ dependency: 3.12
+ from: s/:leguer$/:v1.20/g
+ - v1.19:
+ buildargs:
+ branch: stable/kali
+ slave: lf-virtual1
+ dependency: 3.11
+ from: s/:kali$/:v1.19/g
+ - v1.18:
+ branch: stable/kali
+ slave: lf-virtual1
+ dependency: 3.11
+ buildargs: --build-arg K8S_TAG=1.18
+ from: s/:kali$/:v1.18/g
+ - v1.17:
+ buildargs:
+ branch: stable/jerma
+ slave: lf-virtual1
+ dependency: 3.10
+ from: s/:jerma$/:v1.17/g
+ - v1.16:
+ branch: stable/jerma
+ slave: lf-virtual1
+ dependency: 3.10
+ buildargs: --build-arg K8S_TAG=1.16
+ from: s/:jerma$/:v1.16/g
+ - v1.15:
+ buildargs:
+ branch: stable/iruya
+ slave: lf-virtual1
+ dependency: 3.9
+ from: s/:iruya$/:v1.15/g
+ - v1.14:
+ branch: stable/iruya
+ slave: lf-virtual1
+ dependency: 3.9
+ buildargs: --build-arg K8S_TAG=1.14
+ from: s/:iruya$/:v1.14/g
+ - v1.13:
+ buildargs:
+ branch: stable/hunter
+ slave: lf-virtual1
+ dependency: 3.9
+ from: s/:hunter$/:v1.13/g
+
+- functest-kubernetes-ng-jobs: &functest-kubernetes-ng-jobs
+ name: 'functest-kubernetes-ng-jobs'
+ current-parameters: true
+
+- parameter:
+ name: functest-kubernetes-ng-slave
+ parameters:
+ - label:
+ name: slave
+ default: '{slave}'
+
+
+- functest-kubernetes-ng-build-containers: &functest-kubernetes-ng-build-containers
+ name: 'functest-kubernetes-ng-build-containers'
+ <<: *functest-kubernetes-ng-containers
+ ref_arg: '{ref_arg}'
+ path: '{path}'
+ buildargs: '{buildargs}'
+ from: '{from}'
+
+- builder:
+ name: functest-kubernetes-ng-build-containers
+ builders:
+ - shell: |
+ set +x
+ if [ "{repo}" = "_" ]; then
+ image={container}:{tag}
+ elif [ "{port}" = "None" ]; then
+ image={repo}/{container}:{tag}
+ else
+ image={repo}:{port}/{container}:{tag}
+ fi
+ build_args=""
+ if [ "{buildargs}" != "None" ]; then
+ build_args="{buildargs}"
+ fi
+ if [ "{ref_arg}" != "None" ]; then
+ build_args="$build_args --build-arg {ref_arg}={ref}"
+ fi
+ cd {path}
+ if [ "{from}" != "None" ]; then
+ sed -i {from} Dockerfile
+ fi
+ sudo docker build $build_args \
+ --pull=false --no-cache --force-rm=true \
+ -t $image .
+
+- scm:
+ name: functest-kubernetes-ng-scm
+ scm:
+ - git:
+ url: 'https://gerrit.opnfv.org/gerrit/functest-kubernetes'
+ refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
+ branches:
+ - '{ref}'
+
+- functest-kubernetes-ng-dep: &functest-kubernetes-ng-dep
+ name: 'functest-kubernetes-ng-containers'
+ repo: '{repo}'
+ port: '{port}'
+ tag: '{tag}'
+ dependency: '{dependency}'
+
+- builder:
+ name: functest-kubernetes-ng-pull-dep-images
+ builders:
+ - shell: |
+ set +x
+ if [ "_" = "_" ]; then
+ image=alpine:{dependency}
+ elif [ "_" = "None" ]; then
+ image=_/alpine:{dependency}
+ else
+ image=_:/alpine{dependency}
+ fi
+ sudo docker pull $image || true
+
+- builder:
+ name: functest-kubernetes-ng-remove-dep-images
+ builders:
+ - shell: |
+ set +x
+ if [ "_" = "_" ]; then
+ image=alpine:{dependency}
+ elif [ "_" = "None" ]; then
+ image=_/alpine:{dependency}
+ else
+ image=_:/alpine{dependency}
+ fi
+ sudo docker rmi $image || true
+
+- job-template:
+ name: 'functest-kubernetes-ng-{repo}-{tag}-dep-pull'
+ parameters:
+ - functest-kubernetes-ng-slave:
+ slave: '{slave}'
+ builders:
+ - functest-kubernetes-ng-pull-dep-images:
+ <<: *functest-kubernetes-ng-dep
+
+- project:
+ name: 'functest-kubernetes-ng-{repo}-{tag}-dep-pull'
+ <<: *functest-kubernetes-ng-params
+ jobs:
+ - 'functest-kubernetes-ng-{repo}-{tag}-dep-pull'
+
+- job-template:
+ name: 'functest-kubernetes-ng-{repo}-{tag}-dep-rmi'
+ parameters:
+ - functest-kubernetes-ng-slave:
+ slave: '{slave}'
+ builders:
+ - functest-kubernetes-ng-remove-dep-images:
+ <<: *functest-kubernetes-ng-dep
+
+- project:
+ name: 'functest-kubernetes-ng-{repo}-{tag}-dep-rmi'
+ <<: *functest-kubernetes-ng-params
+ jobs:
+ - 'functest-kubernetes-ng-{repo}-{tag}-dep-rmi'
+
+
+- builder:
+ name: functest-kubernetes-ng-push-containers
+ builders:
+ - shell: |
+ set +x
+ if [ "{repo}" = "_" ]; then
+ image={container}:{tag}
+ elif [ "{port}" = "None" ]; then
+ image={repo}/{container}:{tag}
+ else
+ image={repo}:{port}/{container}:{tag}
+ fi
+ sudo docker push $image
+
+- trigger:
+ name: functest-kubernetes-ng-commit
+ triggers:
+ - pollscm:
+ cron: "*/30 * * * *"
+
+- job-template:
+ name: 'functest-kubernetes-ng-{repo}-{container}-{tag}-build'
+ parameters:
+ - functest-kubernetes-ng-slave:
+ slave: '{slave}'
+ scm:
+ - functest-kubernetes-ng-scm:
+ ref: '{branch}'
+ builders:
+ - functest-kubernetes-ng-build-containers:
+ <<: *functest-kubernetes-ng-build-containers
+ ref: '{branch}'
+ buildargs: '{buildargs}'
+ - functest-kubernetes-ng-push-containers:
+ <<: *functest-kubernetes-ng-build-containers
+ ref: '{branch}'
+
+- project:
+ name: functest-kubernetes-ng-opnfv-functest-kubernetes-core-{tag}-build
+ <<: *functest-kubernetes-ng-params
+ container: functest-kubernetes-core
+ ref_arg: BRANCH
+ path: docker/core
+ jobs:
+ - 'functest-kubernetes-ng-{repo}-{container}-{tag}-build'
+
+- project:
+ name: functest-kubernetes-ng-opnfv-functest-kubernetes-healthcheck-{tag}-build
+ <<: *functest-kubernetes-ng-params
+ container: functest-kubernetes-healthcheck
+ ref_arg:
+ path: docker/healthcheck
+ jobs:
+ - 'functest-kubernetes-ng-{repo}-{container}-{tag}-build'
+
+- project:
+ name: functest-kubernetes-ng-opnfv-functest-kubernetes-cnf-{tag}-build
+ <<: *functest-kubernetes-ng-params
+ container: functest-kubernetes-cnf
+ ref_arg: BRANCH
+ path: docker/cnf
+ jobs:
+ - 'functest-kubernetes-ng-{repo}-{container}-{tag}-build'
+
+- project:
+ name: functest-kubernetes-ng-opnfv-functest-kubernetes-security-{tag}-build
+ <<: *functest-kubernetes-ng-params
+ container: functest-kubernetes-security
+ ref_arg: BRANCH
+ path: docker/security
+ jobs:
+ - 'functest-kubernetes-ng-{repo}-{container}-{tag}-build'
+
+- project:
+ name: functest-kubernetes-ng-opnfv-functest-kubernetes-smoke-{tag}-build
+ <<: *functest-kubernetes-ng-params
+ container: functest-kubernetes-smoke
+ ref_arg:
+ path: docker/smoke
+ jobs:
+ - 'functest-kubernetes-ng-{repo}-{container}-{tag}-build'
+
+- project:
+ name: functest-kubernetes-ng-opnfv-functest-kubernetes-benchmarking-{tag}-build
+ <<: *functest-kubernetes-ng-params
+ container: functest-kubernetes-benchmarking
+ ref_arg:
+ path: docker/benchmarking
+ jobs:
+ - 'functest-kubernetes-ng-{repo}-{container}-{tag}-build'
+
+
+- job-template:
+ name: 'functest-kubernetes-ng-{tag}-docker'
+ project-type: multijob
+ triggers:
+ - functest-kubernetes-ng-commit
+ scm:
+ - functest-kubernetes-ng-scm:
+ ref: '{branch}'
+ parameters:
+ - functest-kubernetes-ng-slave:
+ slave: '{slave}'
+ properties:
+ - build-blocker:
+ use-build-blocker: true
+ blocking-level: 'NODE'
+ blocking-jobs:
+ - '^functest-kubernetes-ng-{tag}-(daily|docker|review)$'
+ builders:
+ - multijob:
+ name: remove dependency
+ projects:
+ - name: 'functest-kubernetes-ng-{repo}-{tag}-dep-rmi'
+ <<: *functest-kubernetes-ng-jobs
+ - multijob:
+ name: pull dependency
+ projects:
+ - name: 'functest-kubernetes-ng-{repo}-{tag}-dep-pull'
+ <<: *functest-kubernetes-ng-jobs
+ - multijob:
+ name: build opnfv/functest-kubernetes-core
+ projects:
+ - name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-core-{tag}-build'
+ <<: *functest-kubernetes-ng-jobs
+ - multijob:
+ name: build containers
+ projects:
+ - name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-healthcheck-{tag}-build'
+ <<: *functest-kubernetes-ng-jobs
+ - name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-cnf-{tag}-build'
+ <<: *functest-kubernetes-ng-jobs
+ - name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-security-{tag}-build'
+ <<: *functest-kubernetes-ng-jobs
+ - multijob:
+ name: build opnfv/functest-kubernetes-smoke
+ projects:
+ - name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-smoke-{tag}-build'
+ <<: *functest-kubernetes-ng-jobs
+ - multijob:
+ name: build opnfv/functest-kubernetes-benchmarking
+ projects:
+ - name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-benchmarking-{tag}-build'
+ <<: *functest-kubernetes-ng-jobs
+
+- builder:
+ name: functest-kubernetes-ng-trivy
+ builders:
+ - shell: |
+ sudo apt-get update && sudo apt-get install curl -y
+ curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
+ if [ "{repo}" = "_" ]; then
+ image={container}:{tag}
+ elif [ "{port}" = "None" ]; then
+ image={repo}/{container}:{tag}
+ else
+ image={repo}:{port}/{container}:{tag}
+ fi
+ ./trivy --exit-code 1 $image
+
+- job-template:
+ name: 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'
+ triggers:
+ - timed: '@daily'
+ parameters:
+ - functest-kubernetes-ng-slave:
+ slave: '{slave}'
+ builders:
+ - functest-kubernetes-ng-trivy:
+ <<: *functest-kubernetes-ng-containers
+
+- project:
+ name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-core-trivy'
+ <<: *functest-kubernetes-ng-params
+ 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-functest-kubernetes-benchmarking-trivy'
+ <<: *functest-kubernetes-ng-params
+ container: 'functest-kubernetes-benchmarking'
+ jobs:
+ - 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'
+
+- project:
+ name: 'functest-kubernetes-ng'
+ <<: *functest-kubernetes-ng-params
+ jobs:
+ - 'functest-kubernetes-ng-{tag}-docker'
+
+- view:
+ name: functest-kubernetes-ng-docker
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-kubernetes-ng-[a-z0-9.]+-docker$
+
+- view:
+ name: functest-kubernetes-ng-trivy
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-kubernetes-ng-[a-z0-9-.]+-trivy$
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index bcd6fde81..803e74eff 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -1,7 +1,10 @@
---
-- functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs
- name: 'functest-kubernetes-pi-jobs'
- current-parameters: true
+- functest-kubernetes-pi-containers: &functest-kubernetes-pi-containers
+ name: 'functest-kubernetes-pi-containers'
+ repo: '{repo}'
+ port: '{port}'
+ container: '{container}'
+ tag: '{tag}'
- functest-kubernetes-pi-params: &functest-kubernetes-pi-params
name: 'functest-kubernetes-pi-params'
@@ -9,60 +12,46 @@
port:
tag:
- latest:
- branch: 'master'
slave: lf-virtual1-6
- leguer:
- branch: 'master'
slave: lf-virtual1-5
- kali:
- branch: 'master'
slave: lf-virtual1-4
- jerma:
- branch: 'master'
slave: lf-virtual1-3
- iruya:
- branch: 'master'
slave: lf-virtual1-2
- hunter:
- branch: 'master'
slave: lf-virtual1-1
- arm-latest:
- branch: 'master'
slave: lf-virtual1-6
- arm-leguer:
- branch: 'master'
slave: lf-virtual1-5
- arm-kali:
- branch: 'master'
slave: lf-virtual1-4
- arm-jerma:
- branch: 'master'
slave: lf-virtual1-3
- arm-iruya:
- branch: 'master'
slave: lf-virtual1-2
- arm-hunter:
- branch: 'master'
slave: lf-virtual1-1
- arm64-latest:
- branch: 'master'
slave: lf-virtual1-6
- arm64-leguer:
- branch: 'master'
slave: lf-virtual1-5
- arm64-kali:
- branch: 'master'
slave: lf-virtual1-4
- arm64-jerma:
- branch: 'master'
slave: lf-virtual1-3
- arm64-iruya:
- branch: 'master'
slave: lf-virtual1-2
- arm64-hunter:
- branch: 'master'
slave: lf-virtual1-1
+- functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs
+ name: 'functest-kubernetes-pi-jobs'
+ current-parameters: true
+
- parameter:
name: functest-kubernetes-pi-slave
parameters:
@@ -83,13 +72,6 @@
name: DEPLOY_SCENARIO
default: k8-nosdn-nofeature-noha
-- functest-kubernetes-pi-containers: &functest-kubernetes-pi-containers
- name: 'functest-kubernetes-pi-containers'
- repo: '{repo}'
- port: '{port}'
- container: '{container}'
- tag: '{tag}'
-
- functest-kubernetes-pi-run-containers: &functest-kubernetes-pi-run-containers
name: 'functest-kubernetes-pi-run-containers'
<<: *functest-kubernetes-pi-containers
@@ -154,7 +136,6 @@
fi
docker rmi $image || true
-
- job-template:
name: 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
parameters:
@@ -372,6 +353,7 @@
builders:
- shell: |
set +x
+ [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
elif [ "{port}" = "None" ]; then
@@ -507,7 +489,7 @@
<<: *functest-kubernetes-pi-jobs
- project:
- name: 'functest-kubernetes-pi'
+ name: 'functest-kubernetes-pi-daily'
<<: *functest-kubernetes-pi-params
jobs:
- 'functest-kubernetes-pi-{tag}-daily'
@@ -522,4 +504,4 @@
- last-success
- last-failure
- last-duration
- regex: ^functest-kubernetes-pi-[a-z-0-9]+-daily$
+ regex: ^functest-kubernetes-pi-[a-z-0-9.]+-daily$
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 5c61e45f8..2c584b309 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -1,7 +1,10 @@
---
-- functest-kubernetes-jobs: &functest-kubernetes-jobs
- name: 'functest-kubernetes-jobs'
- current-parameters: true
+- functest-kubernetes-containers: &functest-kubernetes-containers
+ name: 'functest-kubernetes-containers'
+ repo: '{repo}'
+ port: '{port}'
+ container: '{container}'
+ tag: '{tag}'
- functest-kubernetes-params: &functest-kubernetes-params
name: 'functest-kubernetes-params'
@@ -9,30 +12,46 @@
port:
tag:
- latest:
+ from:
+ buildargs:
branch: master
slave: lf-virtual1-6
dependency: 3.13
- leguer:
+ from:
+ buildargs:
branch: stable/leguer
slave: lf-virtual1-5
dependency: 3.12
- kali:
+ from:
+ buildargs:
branch: stable/kali
slave: lf-virtual1-4
dependency: 3.11
- jerma:
+ from:
+ buildargs:
branch: stable/jerma
slave: lf-virtual1-3
dependency: 3.10
- iruya:
+ from:
+ buildargs:
branch: stable/iruya
slave: lf-virtual1-2
dependency: 3.9
- hunter:
+ from:
+ buildargs:
branch: stable/hunter
slave: lf-virtual1-1
dependency: 3.9
+- functest-kubernetes-jobs: &functest-kubernetes-jobs
+ name: 'functest-kubernetes-jobs'
+ current-parameters: true
+
- parameter:
name: functest-kubernetes-slave
parameters:
@@ -53,13 +72,6 @@
name: DEPLOY_SCENARIO
default: k8-nosdn-nofeature-noha
-- functest-kubernetes-containers: &functest-kubernetes-containers
- name: 'functest-kubernetes-containers'
- repo: '{repo}'
- port: '{port}'
- container: '{container}'
- tag: '{tag}'
-
- functest-kubernetes-run-containers: &functest-kubernetes-run-containers
name: 'functest-kubernetes-run-containers'
<<: *functest-kubernetes-containers
@@ -124,43 +136,6 @@
fi
docker rmi $image || true
-- functest-kubernetes-build-containers: &functest-kubernetes-build-containers
- name: 'functest-kubernetes-build-containers'
- <<: *functest-kubernetes-containers
- ref_arg: '{ref_arg}'
- path: '{path}'
-
-- builder:
- name: functest-kubernetes-build-containers
- builders:
- - shell: |
- set +x
- if [ "{repo}" = "_" ]; then
- image={container}:{tag}
- elif [ "{port}" = "None" ]; then
- image={repo}/{container}:{tag}
- else
- image={repo}:{port}/{container}:{tag}
- fi
- if [ "{ref_arg}" = "None" ]; then
- build_arg=""
- else
- build_arg="--build-arg {ref_arg}={ref}"
- fi
- cd {path}
- docker build $build_arg \
- --pull=false --no-cache --force-rm=true \
- -t $image .
-
-- scm:
- name: functest-kubernetes-scm
- scm:
- - git:
- url: 'https://gerrit.opnfv.org/gerrit/functest-kubernetes'
- refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
- branches:
- - '{ref}'
-
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-pull'
parameters:
@@ -348,6 +323,7 @@
builders:
- shell: |
set +x
+ [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
elif [ "{port}" = "None" ]; then
@@ -482,6 +458,68 @@
- name: 'functest-kubernetes-{tag}-zip'
<<: *functest-kubernetes-jobs
+- project:
+ name: 'functest-kubernetes-daily'
+ <<: *functest-kubernetes-params
+ jobs:
+ - 'functest-kubernetes-{tag}-daily'
+
+- view:
+ name: functest-kubernetes
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-kubernetes-[a-z0-9.]+-daily$
+
+- functest-kubernetes-build-containers: &functest-kubernetes-build-containers
+ name: 'functest-kubernetes-build-containers'
+ <<: *functest-kubernetes-containers
+ ref_arg: '{ref_arg}'
+ path: '{path}'
+ buildargs: '{buildargs}'
+ from: '{from}'
+
+- builder:
+ name: functest-kubernetes-build-containers
+ builders:
+ - shell: |
+ set +x
+ if [ "{repo}" = "_" ]; then
+ image={container}:{tag}
+ elif [ "{port}" = "None" ]; then
+ image={repo}/{container}:{tag}
+ else
+ image={repo}:{port}/{container}:{tag}
+ fi
+ build_args=""
+ if [ "{buildargs}" != "None" ]; then
+ build_args="{buildargs}"
+ fi
+ if [ "{ref_arg}" != "None" ]; then
+ build_args="$build_args --build-arg {ref_arg}={ref}"
+ fi
+ cd {path}
+ if [ "{from}" != "None" ]; then
+ sed -i {from} Dockerfile
+ fi
+ docker build $build_args \
+ --pull=false --no-cache --force-rm=true \
+ -t $image .
+
+- scm:
+ name: functest-kubernetes-scm
+ scm:
+ - git:
+ url: 'https://gerrit.opnfv.org/gerrit/functest-kubernetes'
+ refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
+ branches:
+ - '{ref}'
+
- functest-kubernetes-dep: &functest-kubernetes-dep
name: 'functest-kubernetes-containers'
repo: '{repo}'
@@ -581,6 +619,20 @@
jobs:
- 'functest-kubernetes-{tag}-tox'
+- job-template:
+ name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+ parameters:
+ - functest-kubernetes-slave:
+ slave: '{slave}'
+ scm:
+ - functest-kubernetes-scm:
+ ref: $GERRIT_REFSPEC
+ builders:
+ - functest-kubernetes-build-containers:
+ <<: *functest-kubernetes-build-containers
+ ref: $GERRIT_REFSPEC
+ buildargs: '{buildargs}'
+
- project:
name: functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-gate
<<: *functest-kubernetes-params
@@ -636,19 +688,6 @@
- 'functest-kubernetes-{repo}-{container}-{tag}-gate'
-- job-template:
- name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
- parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
- scm:
- - functest-kubernetes-scm:
- ref: $GERRIT_REFSPEC
- builders:
- - functest-kubernetes-build-containers:
- <<: *functest-kubernetes-build-containers
- ref: $GERRIT_REFSPEC
-
- trigger:
name: functest-kubernetes-patchset-created
triggers:
@@ -777,6 +816,36 @@
- name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
<<: *functest-kubernetes-jobs
+- project:
+ name: 'functest-kubernetes-review'
+ <<: *functest-kubernetes-params
+ jobs:
+ - 'functest-kubernetes-{tag}-review'
+
+- view:
+ name: functest-kubernetes-review
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-kubernetes-[a-z0-9.]+-review$
+
+- view:
+ name: functest-kubernetes-tox
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-kubernetes-[a-z0-9.]+-tox$
+
- builder:
name: functest-kubernetes-push-containers
builders:
@@ -809,6 +878,7 @@
- functest-kubernetes-build-containers:
<<: *functest-kubernetes-build-containers
ref: '{branch}'
+ buildargs: '{buildargs}'
- functest-kubernetes-push-containers:
<<: *functest-kubernetes-build-containers
ref: '{branch}'
@@ -948,33 +1018,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'
@@ -982,47 +1063,9 @@
name: 'functest-kubernetes'
<<: *functest-kubernetes-params
jobs:
- - 'functest-kubernetes-{tag}-daily'
- - 'functest-kubernetes-{tag}-review'
- 'functest-kubernetes-{tag}-docker'
- view:
- name: functest-kubernetes
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^functest-kubernetes-[a-z0-9]+-daily$
-
-- view:
- name: functest-kubernetes-review
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^functest-kubernetes-[a-z0-9]+-review$
-
-- view:
- name: functest-kubernetes-tox
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^functest-kubernetes-[a-z0-9]+-tox$
-
-- view:
name: functest-kubernetes-docker
view-type: list
columns:
@@ -1032,7 +1075,7 @@
- last-success
- last-failure
- last-duration
- regex: ^functest-kubernetes-[a-z0-9]+-docker$
+ regex: ^functest-kubernetes-[a-z0-9.]+-docker$
- view:
name: functest-kubernetes-trivy
@@ -1044,4 +1087,4 @@
- last-success
- last-failure
- last-duration
- regex: ^functest-kubernetes-[a-z-0-9]+-trivy$
+ regex: (?!functest-kubernetes-pi)(?!functest-kubernetes-ng)^functest-kubernetes-[a-z-0-9.]+-trivy$
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 51f8df3bb..78635d7c8 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -1,7 +1,10 @@
---
-- functest-pi-jobs: &functest-pi-jobs
- name: 'functest-pi-jobs'
- current-parameters: true
+- functest-pi-containers: &functest-pi-containers
+ name: 'functest-pi-containers'
+ repo: '{repo}'
+ port: '{port}'
+ container: '{container}'
+ tag: '{tag}'
- functest-pi-params: &functest-pi-params
name: 'functest-pi-params'
@@ -9,77 +12,63 @@
port:
tag:
- latest:
- branch: master
slave: lf-virtual9
- dashboard_url: http://172.30.13.94
+ DASHBOARD_URL: http://172.30.13.94
- leguer:
- branch: stable/leguer
slave: lf-virtual9
- dashboard_url: http://172.30.13.94
+ DASHBOARD_URL: http://172.30.13.94
- kali:
- branch: stable/kali
slave: lf-pod4-3
- dashboard_url: http://172.30.12.88
+ DASHBOARD_URL: http://172.30.12.88
- jerma:
- branch: stable/jerma
slave: lf-pod4
- dashboard_url: http://172.30.12.83
+ DASHBOARD_URL: http://172.30.12.83
- iruya:
- branch: stable/iruya
slave: lf-virtual4
- dashboard_url: http://172.30.13.89
+ DASHBOARD_URL: http://172.30.13.89
- hunter:
- branch: stable/hunter
slave: lf-virtual6
- dashboard_url: http://172.30.13.91
+ DASHBOARD_URL: http://172.30.13.91
- arm-latest:
- branch: master
slave: lf-virtual9
- dashboard_url: http://172.30.13.94
+ DASHBOARD_URL: http://172.30.13.94
- arm-leguer:
- branch: stable/leguer
slave: lf-virtual9
- dashboard_url: http://172.30.13.94
+ DASHBOARD_URL: http://172.30.13.94
- arm-kali:
- branch: stable/kali
slave: lf-pod4-3
- dashboard_url: http://172.30.12.88
+ DASHBOARD_URL: http://172.30.12.88
- arm-jerma:
- branch: stable/jerma
slave: lf-pod4
- dashboard_url: http://172.30.12.83
+ DASHBOARD_URL: http://172.30.12.83
- arm-iruya:
- branch: stable/iruya
slave: lf-virtual4
- dashboard_url: http://172.30.13.89
+ DASHBOARD_URL: http://172.30.13.89
- arm-hunter:
- branch: stable/hunter
slave: lf-virtual6
- dashboard_url: http://172.30.13.91
+ DASHBOARD_URL: http://172.30.13.91
- arm64-latest:
- branch: master
slave: lf-virtual9
- dashboard_url: http://172.30.13.94
+ DASHBOARD_URL: http://172.30.13.94
- arm64-leguer:
- branch: stable/leguer
slave: lf-virtual9
- dashboard_url: http://172.30.13.94
+ DASHBOARD_URL: http://172.30.13.94
- arm64-kali:
- branch: stable/kali
slave: lf-pod4-3
- dashboard_url: http://172.30.12.88
+ DASHBOARD_URL: http://172.30.12.88
- arm64-jerma:
- branch: stable/jerma
slave: lf-pod4
- dashboard_url: http://172.30.12.83
+ DASHBOARD_URL: http://172.30.12.83
- arm64-iruya:
- branch: stable/iruya
slave: lf-virtual4
- dashboard_url: http://172.30.13.89
+ DASHBOARD_URL: http://172.30.13.89
- arm64-hunter:
- branch: stable/hunter
slave: lf-virtual6
- dashboard_url: http://172.30.13.91
+ DASHBOARD_URL: http://172.30.13.91
+
+- functest-pi-jobs: &functest-pi-jobs
+ name: 'functest-pi-jobs'
+ current-parameters: true
- parameter:
name: functest-pi-slave
@@ -113,19 +102,13 @@
name: IMAGE_PROPERTIES
default: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
-- functest-pi-containers: &functest-pi-containers
- name: 'functest-pi-containers'
- repo: '{repo}'
- port: '{port}'
- container: '{container}'
- tag: '{tag}'
-
- functest-pi-run-containers: &functest-pi-run-containers
name: 'functest-pi-run-containers'
<<: *functest-pi-containers
test: '{test}'
privileged: '{privileged}'
network: '{network}'
+ DASHBOARD_URL: '{DASHBOARD_URL}'
- builder:
name: functest-pi-pull-containers
@@ -169,6 +152,7 @@
-e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
-e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \
-e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \
+ -e DASHBOARD_URL={DASHBOARD_URL} \
-v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
-v /home/opnfv/functest/images:/home/opnfv/functest/images \
$image run_tests -t {test} -p -r
@@ -187,7 +171,6 @@
fi
sudo docker rmi $image || true
-
- job-template:
name: 'functest-pi-{repo}-{container}-{tag}-pull'
parameters:
@@ -533,6 +516,7 @@
builders:
- shell: |
set +x
+ [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
elif [ "{port}" = "None" ]; then
@@ -766,7 +750,7 @@
<<: *functest-pi-jobs
- project:
- name: 'functest-pi'
+ name: 'functest-pi-daily'
<<: *functest-pi-params
jobs:
- 'functest-pi-{tag}-daily'
@@ -781,4 +765,4 @@
- last-success
- last-failure
- last-duration
- regex: (?!functest-kubernetes)^functest-pi-[a-z-0-9]+-daily$
+ regex: ^functest-pi-[a-z-0-9.]+-daily$
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 967ce5d77..0c16041e2 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -1,7 +1,10 @@
---
-- functest-jobs: &functest-jobs
- name: 'functest-jobs'
- current-parameters: true
+- functest-containers: &functest-containers
+ name: 'functest-containers'
+ repo: '{repo}'
+ port: '{port}'
+ container: '{container}'
+ tag: '{tag}'
- functest-params: &functest-params
name: 'functest-params'
@@ -9,36 +12,52 @@
port:
tag:
- latest:
+ from:
+ buildargs:
branch: master
slave: lf-virtual9
- dashboard_url: http://172.30.13.94
+ DASHBOARD_URL: http://172.30.13.94
dependency: 3.13
- leguer:
+ from:
+ buildargs:
branch: stable/leguer
slave: lf-virtual9
- dashboard_url: http://172.30.13.94
+ DASHBOARD_URL: http://172.30.13.94
dependency: 3.12
- kali:
+ from:
+ buildargs:
branch: stable/kali
slave: lf-pod4-3
- dashboard_url: http://172.30.12.88
+ DASHBOARD_URL: http://172.30.12.88
dependency: 3.11
- jerma:
+ from:
+ buildargs:
branch: stable/jerma
slave: lf-pod4
- dashboard_url: http://172.30.12.83
+ DASHBOARD_URL: http://172.30.12.83
dependency: 3.10
- iruya:
+ from:
+ buildargs:
branch: stable/iruya
slave: lf-virtual4
- dashboard_url: http://172.30.13.89
+ DASHBOARD_URL: http://172.30.13.89
dependency: 3.9
- hunter:
+ from:
+ buildargs:
branch: stable/hunter
slave: lf-virtual6
- dashboard_url: http://172.30.13.91
+ DASHBOARD_URL: http://172.30.13.91
dependency: 3.9
+- functest-jobs: &functest-jobs
+ name: 'functest-jobs'
+ current-parameters: true
+
- parameter:
name: functest-slave
parameters:
@@ -71,19 +90,13 @@
name: IMAGE_PROPERTIES
default: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
-- functest-containers: &functest-containers
- name: 'functest-containers'
- repo: '{repo}'
- port: '{port}'
- container: '{container}'
- tag: '{tag}'
-
- functest-run-containers: &functest-run-containers
name: 'functest-run-containers'
<<: *functest-containers
test: '{test}'
privileged: '{privileged}'
network: '{network}'
+ DASHBOARD_URL: '{DASHBOARD_URL}'
- builder:
name: functest-pull-containers
@@ -127,6 +140,7 @@
-e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
-e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \
-e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \
+ -e DASHBOARD_URL={DASHBOARD_URL} \
-v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
-v /home/opnfv/functest/images:/home/opnfv/functest/images \
$image run_tests -t {test} -p -r
@@ -145,43 +159,6 @@
fi
sudo docker rmi $image || true
-- functest-build-containers: &functest-build-containers
- name: 'functest-build-containers'
- <<: *functest-containers
- ref_arg: '{ref_arg}'
- path: '{path}'
-
-- builder:
- name: functest-build-containers
- builders:
- - shell: |
- set +x
- if [ "{repo}" = "_" ]; then
- image={container}:{tag}
- elif [ "{port}" = "None" ]; then
- image={repo}/{container}:{tag}
- else
- image={repo}:{port}/{container}:{tag}
- fi
- if [ "{ref_arg}" = "None" ]; then
- build_arg=""
- else
- build_arg="--build-arg {ref_arg}={ref}"
- fi
- cd {path}
- sudo docker build $build_arg \
- --pull=false --no-cache --force-rm=true \
- -t $image .
-
-- scm:
- name: functest-scm
- scm:
- - git:
- url: 'https://gerrit.opnfv.org/gerrit/functest'
- refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
- branches:
- - '{ref}'
-
- job-template:
name: 'functest-{repo}-{container}-{tag}-pull'
parameters:
@@ -457,6 +434,7 @@
builders:
- shell: |
set +x
+ [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
elif [ "{port}" = "None" ]; then
@@ -689,6 +667,68 @@
- name: 'functest-{tag}-zip'
<<: *functest-jobs
+- project:
+ name: 'functest-daily'
+ <<: *functest-params
+ jobs:
+ - 'functest-{tag}-daily'
+
+- view:
+ name: functest
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-[a-z0-9.]+-daily$
+
+- functest-build-containers: &functest-build-containers
+ name: 'functest-build-containers'
+ <<: *functest-containers
+ ref_arg: '{ref_arg}'
+ path: '{path}'
+ buildargs: '{buildargs}'
+ from: '{from}'
+
+- builder:
+ name: functest-build-containers
+ builders:
+ - shell: |
+ set +x
+ if [ "{repo}" = "_" ]; then
+ image={container}:{tag}
+ elif [ "{port}" = "None" ]; then
+ image={repo}/{container}:{tag}
+ else
+ image={repo}:{port}/{container}:{tag}
+ fi
+ build_args=""
+ if [ "{buildargs}" != "None" ]; then
+ build_args="{buildargs}"
+ fi
+ if [ "{ref_arg}" != "None" ]; then
+ build_args="$build_args --build-arg {ref_arg}={ref}"
+ fi
+ cd {path}
+ if [ "{from}" != "None" ]; then
+ sed -i {from} Dockerfile
+ fi
+ sudo docker build $build_args \
+ --pull=false --no-cache --force-rm=true \
+ -t $image .
+
+- scm:
+ name: functest-scm
+ scm:
+ - git:
+ url: 'https://gerrit.opnfv.org/gerrit/functest'
+ refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
+ branches:
+ - '{ref}'
+
- functest-dep: &functest-dep
name: 'functest-containers'
repo: '{repo}'
@@ -788,6 +828,20 @@
jobs:
- 'functest-{tag}-tox'
+- job-template:
+ name: 'functest-{repo}-{container}-{tag}-gate'
+ parameters:
+ - functest-slave:
+ slave: '{slave}'
+ scm:
+ - functest-scm:
+ ref: $GERRIT_REFSPEC
+ builders:
+ - functest-build-containers:
+ <<: *functest-build-containers
+ ref: $GERRIT_REFSPEC
+ buildargs: '{buildargs}'
+
- project:
name: functest-opnfv-functest-core-{tag}-gate
<<: *functest-params
@@ -798,6 +852,20 @@
- 'functest-{repo}-{container}-{tag}-gate'
- project:
+ name: functest-opnfv-functest-tempest-{tag}-gate
+ <<: *functest-params
+ container: functest-tempest
+ ref_arg: BRANCH
+ path: docker/tempest
+ exclude:
+ - {'tag': 'latest'}
+ - {'tag': 'leguer'}
+ - {'tag': 'kali'}
+ - {'tag': 'jerma'}
+ jobs:
+ - 'functest-{repo}-{container}-{tag}-gate'
+
+- project:
name: functest-opnfv-functest-healthcheck-{tag}-gate
<<: *functest-params
container: functest-healthcheck
@@ -852,19 +920,6 @@
- 'functest-{repo}-{container}-{tag}-gate'
-- job-template:
- name: 'functest-{repo}-{container}-{tag}-gate'
- parameters:
- - functest-slave:
- slave: '{slave}'
- scm:
- - functest-scm:
- ref: $GERRIT_REFSPEC
- builders:
- - functest-build-containers:
- <<: *functest-build-containers
- ref: $GERRIT_REFSPEC
-
- trigger:
name: functest-patchset-created
triggers:
@@ -937,6 +992,11 @@
- name: 'functest-opnfv-functest-core-{tag}-gate'
<<: *functest-jobs
- multijob:
+ name: build opnfv/functest-tempest
+ projects:
+ - name: 'functest-opnfv-functest-tempest-{tag}-gate'
+ <<: *functest-jobs
+ - multijob:
name: build containers
projects:
- name: 'functest-opnfv-functest-healthcheck-{tag}-gate'
@@ -1081,6 +1141,36 @@
- name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
<<: *functest-jobs
+- project:
+ name: 'functest-review'
+ <<: *functest-params
+ jobs:
+ - 'functest-{tag}-review'
+
+- view:
+ name: functest-review
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-[a-z0-9.]+-review$
+
+- view:
+ name: functest-tox
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-[a-z0-9.]+-tox$
+
- builder:
name: functest-push-containers
builders:
@@ -1113,6 +1203,7 @@
- functest-build-containers:
<<: *functest-build-containers
ref: '{branch}'
+ buildargs: '{buildargs}'
- functest-push-containers:
<<: *functest-build-containers
ref: '{branch}'
@@ -1127,6 +1218,20 @@
- 'functest-{repo}-{container}-{tag}-build'
- project:
+ name: functest-opnfv-functest-tempest-{tag}-build
+ <<: *functest-params
+ container: functest-tempest
+ ref_arg: BRANCH
+ path: docker/tempest
+ exclude:
+ - {'tag': 'latest'}
+ - {'tag': 'leguer'}
+ - {'tag': 'kali'}
+ - {'tag': 'jerma'}
+ jobs:
+ - 'functest-{repo}-{container}-{tag}-build'
+
+- project:
name: functest-opnfv-functest-healthcheck-{tag}-build
<<: *functest-params
container: functest-healthcheck
@@ -1215,6 +1320,11 @@
- name: 'functest-opnfv-functest-core-{tag}-build'
<<: *functest-jobs
- multijob:
+ name: build opnfv/functest-tempest
+ projects:
+ - name: 'functest-opnfv-functest-tempest-{tag}-build'
+ <<: *functest-jobs
+ - multijob:
name: build containers
projects:
- name: 'functest-opnfv-functest-healthcheck-{tag}-build'
@@ -1260,39 +1370,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'
@@ -1300,47 +1429,9 @@
name: 'functest'
<<: *functest-params
jobs:
- - 'functest-{tag}-daily'
- - 'functest-{tag}-review'
- 'functest-{tag}-docker'
- view:
- name: functest
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^functest-[a-z0-9]+-daily$
-
-- view:
- name: functest-review
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^functest-[a-z0-9]+-review$
-
-- view:
- name: functest-tox
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^functest-[a-z0-9]+-tox$
-
-- view:
name: functest-docker
view-type: list
columns:
@@ -1350,7 +1441,7 @@
- last-success
- last-failure
- last-duration
- regex: ^functest-[a-z0-9]+-docker$
+ regex: ^functest-[a-z0-9.]+-docker$
- view:
name: functest-trivy
@@ -1362,4 +1453,4 @@
- last-success
- last-failure
- last-duration
- regex: (?!functest-kubernetes)^functest-[a-z-0-9]+-trivy$
+ regex: (?!functest-kubernetes)(?!functest-pi)^functest-[a-z-0-9.]+-trivy$
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index e3830ec68..f07a10581 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -1,7 +1,10 @@
---
-- xtesting-pi-jobs: &xtesting-pi-jobs
- name: 'xtesting-pi-jobs'
- current-parameters: true
+- xtesting-pi-containers: &xtesting-pi-containers
+ name: 'xtesting-pi-containers'
+ repo: '{repo}'
+ port: '{port}'
+ container: '{container}'
+ tag: '{tag}'
- xtesting-pi-params: &xtesting-pi-params
name: 'xtesting-pi-params'
@@ -9,60 +12,46 @@
port:
tag:
- latest:
- branch: 'master'
slave: lf-virtual1
- leguer:
- branch: 'master'
slave: lf-virtual1
- kali:
- branch: 'master'
slave: lf-virtual1
- jerma:
- branch: 'master'
slave: lf-virtual1
- iruya:
- branch: 'master'
slave: lf-virtual1
- hunter:
- branch: 'master'
slave: lf-virtual1
- arm-latest:
- branch: 'master'
slave: lf-virtual1
- arm-leguer:
- branch: 'master'
slave: lf-virtual1
- arm-kali:
- branch: 'master'
slave: lf-virtual1
- arm-jerma:
- branch: 'master'
slave: lf-virtual1
- arm-iruya:
- branch: 'master'
slave: lf-virtual1
- arm-hunter:
- branch: 'master'
slave: lf-virtual1
- arm64-latest:
- branch: 'master'
slave: lf-virtual1
- arm64-leguer:
- branch: 'master'
slave: lf-virtual1
- arm64-kali:
- branch: 'master'
slave: lf-virtual1
- arm64-jerma:
- branch: 'master'
slave: lf-virtual1
- arm64-iruya:
- branch: 'master'
slave: lf-virtual1
- arm64-hunter:
- branch: 'master'
slave: lf-virtual1
+- xtesting-pi-jobs: &xtesting-pi-jobs
+ name: 'xtesting-pi-jobs'
+ current-parameters: true
+
- parameter:
name: xtesting-pi-slave
parameters:
@@ -77,13 +66,6 @@
name: build_tag
-- xtesting-pi-containers: &xtesting-pi-containers
- name: 'xtesting-pi-containers'
- repo: '{repo}'
- port: '{port}'
- container: '{container}'
- tag: '{tag}'
-
- xtesting-pi-run-containers: &xtesting-pi-run-containers
name: 'xtesting-pi-run-containers'
<<: *xtesting-pi-containers
@@ -146,7 +128,6 @@
fi
sudo docker rmi $image || true
-
- job-template:
name: 'xtesting-pi-{repo}-{container}-{tag}-pull'
parameters:
@@ -237,6 +218,7 @@
builders:
- shell: |
set +x
+ [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
elif [ "{port}" = "None" ]; then
@@ -331,7 +313,7 @@
<<: *xtesting-pi-jobs
- project:
- name: 'xtesting-pi'
+ name: 'xtesting-pi-daily'
<<: *xtesting-pi-params
jobs:
- 'xtesting-pi-{tag}-daily'
@@ -346,4 +328,4 @@
- last-success
- last-failure
- last-duration
- regex: ^xtesting-pi-[a-z-0-9]+-daily$
+ regex: ^xtesting-pi-[a-z-0-9.]+-daily$
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 5d2d9bed9..5484a59f7 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -1,7 +1,10 @@
---
-- xtesting-jobs: &xtesting-jobs
- name: 'xtesting-jobs'
- current-parameters: true
+- xtesting-containers: &xtesting-containers
+ name: 'xtesting-containers'
+ repo: '{repo}'
+ port: '{port}'
+ container: '{container}'
+ tag: '{tag}'
- xtesting-params: &xtesting-params
name: 'xtesting-params'
@@ -9,30 +12,46 @@
port:
tag:
- latest:
+ from:
+ buildargs:
branch: master
slave: lf-virtual1
dependency: 3.13
- leguer:
+ from:
+ buildargs:
branch: stable/leguer
slave: lf-virtual1
dependency: 3.12
- kali:
+ from:
+ buildargs:
branch: stable/kali
slave: lf-virtual1
dependency: 3.11
- jerma:
+ from:
+ buildargs:
branch: stable/jerma
slave: lf-virtual1
dependency: 3.10
- iruya:
+ from:
+ buildargs:
branch: stable/iruya
slave: lf-virtual1
dependency: 3.9
- hunter:
+ from:
+ buildargs:
branch: stable/hunter
slave: lf-virtual1
dependency: 3.9
+- xtesting-jobs: &xtesting-jobs
+ name: 'xtesting-jobs'
+ current-parameters: true
+
- parameter:
name: xtesting-slave
parameters:
@@ -47,13 +66,6 @@
name: build_tag
-- xtesting-containers: &xtesting-containers
- name: 'xtesting-containers'
- repo: '{repo}'
- port: '{port}'
- container: '{container}'
- tag: '{tag}'
-
- xtesting-run-containers: &xtesting-run-containers
name: 'xtesting-run-containers'
<<: *xtesting-containers
@@ -116,43 +128,6 @@
fi
sudo docker rmi $image || true
-- xtesting-build-containers: &xtesting-build-containers
- name: 'xtesting-build-containers'
- <<: *xtesting-containers
- ref_arg: '{ref_arg}'
- path: '{path}'
-
-- builder:
- name: xtesting-build-containers
- builders:
- - shell: |
- set +x
- if [ "{repo}" = "_" ]; then
- image={container}:{tag}
- elif [ "{port}" = "None" ]; then
- image={repo}/{container}:{tag}
- else
- image={repo}:{port}/{container}:{tag}
- fi
- if [ "{ref_arg}" = "None" ]; then
- build_arg=""
- else
- build_arg="--build-arg {ref_arg}={ref}"
- fi
- cd {path}
- sudo docker build $build_arg \
- --pull=false --no-cache --force-rm=true \
- -t $image .
-
-- scm:
- name: xtesting-scm
- scm:
- - git:
- url: 'https://gerrit.opnfv.org/gerrit/functest-xtesting'
- refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
- branches:
- - '{ref}'
-
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-pull'
parameters:
@@ -243,6 +218,7 @@
builders:
- shell: |
set +x
+ [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
elif [ "{port}" = "None" ]; then
@@ -336,6 +312,68 @@
- name: 'xtesting-{tag}-zip'
<<: *xtesting-jobs
+- project:
+ name: 'xtesting-daily'
+ <<: *xtesting-params
+ jobs:
+ - 'xtesting-{tag}-daily'
+
+- view:
+ name: xtesting
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^xtesting-[a-z0-9.]+-daily$
+
+- xtesting-build-containers: &xtesting-build-containers
+ name: 'xtesting-build-containers'
+ <<: *xtesting-containers
+ ref_arg: '{ref_arg}'
+ path: '{path}'
+ buildargs: '{buildargs}'
+ from: '{from}'
+
+- builder:
+ name: xtesting-build-containers
+ builders:
+ - shell: |
+ set +x
+ if [ "{repo}" = "_" ]; then
+ image={container}:{tag}
+ elif [ "{port}" = "None" ]; then
+ image={repo}/{container}:{tag}
+ else
+ image={repo}:{port}/{container}:{tag}
+ fi
+ build_args=""
+ if [ "{buildargs}" != "None" ]; then
+ build_args="{buildargs}"
+ fi
+ if [ "{ref_arg}" != "None" ]; then
+ build_args="$build_args --build-arg {ref_arg}={ref}"
+ fi
+ cd {path}
+ if [ "{from}" != "None" ]; then
+ sed -i {from} Dockerfile
+ fi
+ sudo docker build $build_args \
+ --pull=false --no-cache --force-rm=true \
+ -t $image .
+
+- scm:
+ name: xtesting-scm
+ scm:
+ - git:
+ url: 'https://gerrit.opnfv.org/gerrit/functest-xtesting'
+ refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
+ branches:
+ - '{ref}'
+
- xtesting-dep: &xtesting-dep
name: 'xtesting-containers'
repo: '{repo}'
@@ -435,6 +473,20 @@
jobs:
- 'xtesting-{tag}-tox'
+- job-template:
+ name: 'xtesting-{repo}-{container}-{tag}-gate'
+ parameters:
+ - xtesting-slave:
+ slave: '{slave}'
+ scm:
+ - xtesting-scm:
+ ref: $GERRIT_REFSPEC
+ builders:
+ - xtesting-build-containers:
+ <<: *xtesting-build-containers
+ ref: $GERRIT_REFSPEC
+ buildargs: '{buildargs}'
+
- project:
name: xtesting-opnfv-xtesting-{tag}-gate
<<: *xtesting-params
@@ -454,19 +506,6 @@
- 'xtesting-{repo}-{container}-{tag}-gate'
-- job-template:
- name: 'xtesting-{repo}-{container}-{tag}-gate'
- parameters:
- - xtesting-slave:
- slave: '{slave}'
- scm:
- - xtesting-scm:
- ref: $GERRIT_REFSPEC
- builders:
- - xtesting-build-containers:
- <<: *xtesting-build-containers
- ref: $GERRIT_REFSPEC
-
- trigger:
name: xtesting-patchset-created
triggers:
@@ -550,6 +589,36 @@
- name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
<<: *xtesting-jobs
+- project:
+ name: 'xtesting-review'
+ <<: *xtesting-params
+ jobs:
+ - 'xtesting-{tag}-review'
+
+- view:
+ name: xtesting-review
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^xtesting-[a-z0-9.]+-review$
+
+- view:
+ name: xtesting-tox
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^xtesting-[a-z0-9.]+-tox$
+
- builder:
name: xtesting-push-containers
builders:
@@ -582,6 +651,7 @@
- xtesting-build-containers:
<<: *xtesting-build-containers
ref: '{branch}'
+ buildargs: '{buildargs}'
- xtesting-push-containers:
<<: *xtesting-build-containers
ref: '{branch}'
@@ -676,6 +746,7 @@
container: 'xtesting'
jobs:
- 'xtesting-{repo}-{container}-{tag}-trivy'
+
- project:
name: 'xtesting-opnfv-xtesting-mts-trivy'
<<: *xtesting-params
@@ -687,47 +758,9 @@
name: 'xtesting'
<<: *xtesting-params
jobs:
- - 'xtesting-{tag}-daily'
- - 'xtesting-{tag}-review'
- 'xtesting-{tag}-docker'
- view:
- name: xtesting
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^xtesting-[a-z0-9]+-daily$
-
-- view:
- name: xtesting-review
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^xtesting-[a-z0-9]+-review$
-
-- view:
- name: xtesting-tox
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^xtesting-[a-z0-9]+-tox$
-
-- view:
name: xtesting-docker
view-type: list
columns:
@@ -737,7 +770,7 @@
- last-success
- last-failure
- last-duration
- regex: ^xtesting-[a-z0-9]+-docker$
+ regex: ^xtesting-[a-z0-9.]+-docker$
- view:
name: xtesting-trivy
@@ -749,4 +782,4 @@
- last-success
- last-failure
- last-duration
- regex: ^xtesting-[a-z-0-9]+-trivy$
+ regex: (?!xtesting-pi)^xtesting-[a-z-0-9.]+-trivy$
diff --git a/jjb/ovn4nfv/golang-make-test.sh b/jjb/ovn4nfv/golang-make-test.sh
deleted file mode 100644
index 7ed463277..000000000
--- a/jjb/ovn4nfv/golang-make-test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2018 Intel Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-set -o errexit
-set -o pipefail
-
-source /etc/os-release || source /usr/lib/os-release
-case ${ID,,} in
- ubuntu|debian)
- sudo add-apt-repository -y ppa:longsleep/golang-backports
- sudo apt-get update
- sudo apt-get install -y build-essential golang-go
- sudo apt-get -y clean && sudo apt-get -y autoremove
- ;;
-esac
-
-echo "Running unit tests in Go ${golang_version} ..."
-cd $WORKSPACE
-make test
diff --git a/jjb/ovn4nfv/ovn4nfv-k8s-plugins-project-jobs.yaml b/jjb/ovn4nfv/ovn4nfv-k8s-plugins-project-jobs.yaml
deleted file mode 100644
index 849be93c1..000000000
--- a/jjb/ovn4nfv/ovn4nfv-k8s-plugins-project-jobs.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
----
-- project:
- name: ovn4nfv-k8s-plugin-project-jobs
-
- project: 'ovn4nfv-k8s-plugin'
-
- jobs:
- - 'ovn4nfv-k8s-plugin-verify-{stream}'
- - 'ovn4nfv-k8s-plugin-merge-{stream}'
-
- stream:
- - master:
- branch: '{stream}'
- gs-pathname: ''
- disabled: false
-
-################################
-# job templates
-################################
-
-- job-template:
- name: 'ovn4nfv-k8s-plugin-verify-{stream}'
-
- disabled: '{obj:disabled}'
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - opnfv-build-defaults
-
- scm:
- - git-scm-gerrit
-
- triggers:
- - gerrit:
- server-name: 'gerrit.opnfv.org'
- trigger-on:
- - patchset-created-event:
- exclude-drafts: 'false'
- exclude-trivial-rebase: 'false'
- exclude-no-code-change: 'false'
- - draft-published-event
- - comment-added-contains-event:
- comment-contains-value: 'recheck'
- - comment-added-contains-event:
- comment-contains-value: 'reverify'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
-
- wrappers:
- - ssh-agent-wrapper
- - timeout:
- timeout: 30
- fail: true
-
- builders:
- - ovn4nfv-k8s-plugin-unit-tests-golang
-
-- job-template:
- name: 'ovn4nfv-k8s-plugin-merge-{stream}'
-
- disabled: '{obj:disabled}'
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - opnfv-build-defaults
-
- scm:
- - git-scm
-
- triggers:
- - gerrit:
- server-name: 'gerrit.opnfv.org'
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
-
- wrappers:
- - ssh-agent-wrapper
- - timeout:
- timeout: 30
- fail: true
-
- builders:
- - ovn4nfv-k8s-plugin-unit-tests-golang
-
-################################
-# job builders
-################################
-
-- builder:
- name: ovn4nfv-k8s-plugin-unit-tests-golang
- builders:
- - shell:
- !include-raw: ./golang-make-test.sh
diff --git a/jjb/releng/artifact-cleanup.yaml b/jjb/releng/artifact-cleanup.yaml
index 2a250618c..f64650b08 100644
--- a/jjb/releng/artifact-cleanup.yaml
+++ b/jjb/releng/artifact-cleanup.yaml
@@ -21,14 +21,13 @@
# Required Variables:
# stream: branch with - in place of / (eg. stable)
# branch: branch (eg. stable)
- node: master
-
disabled: false
parameters:
- project-parameter:
project: '{project}'
branch: '{branch}'
+ - opnfv-build-defaults
scm:
- git-scm