summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/functest/functest-daily-jobs.yaml165
-rw-r--r--jjb/functest/functest-docker.yaml20
-rw-r--r--jjb/functest/functest-kubernetes-docker.yaml3
-rw-r--r--jjb/functest/functest-kubernetes-project-jobs.yaml4
-rw-r--r--jjb/functest/functest-project-jobs.yaml4
-rw-r--r--jjb/functest/functest-weekly-jobs.yaml128
-rw-r--r--jjb/functest/xtesting-docker.yaml3
-rw-r--r--jjb/functest/xtesting-project-jobs.yaml4
8 files changed, 0 insertions, 331 deletions
diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index 34aee8a9d..08c453f0b 100644
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -14,10 +14,6 @@
stream: master
branch: '{stream}'
gs-pathname: ''
- fraser: &fraser
- stream: fraser
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
gambia: &gambia
stream: gambia
branch: 'stable/{stream}'
@@ -52,68 +48,15 @@
slave-label: fuel-virtual
installer: fuel
<<: *gambia
- - baremetal:
- slave-label: fuel-baremetal
- installer: fuel
- <<: *fraser
- - virtual:
- slave-label: fuel-virtual
- installer: fuel
- <<: *fraser
- # joid CI PODs
- - baremetal:
- slave-label: joid-baremetal
- installer: joid
- <<: *master
- - virtual:
- slave-label: joid-virtual
- installer: joid
- <<: *master
- - baremetal:
- slave-label: joid-baremetal
- installer: joid
- <<: *fraser
- - virtual:
- slave-label: joid-virtual
- installer: joid
- <<: *fraser
# compass CI PODs
- baremetal:
slave-label: compass-baremetal
installer: compass
- <<: *master
- - virtual:
- slave-label: compass-virtual
- installer: compass
- <<: *master
- - arm-virtual:
- slave-label: compass-arm-virtual
- installer: compass
- <<: *master
- - baremetal:
- slave-label: compass-baremetal
- installer: compass
- <<: *fraser
- - virtual:
- slave-label: compass-virtual
- installer: compass
- <<: *fraser
- - arm-virtual:
- slave-label: compass-arm-virtual
- installer: compass
- <<: *fraser
- - baremetal:
- slave-label: compass-baremetal
- installer: compass
<<: *gambia
- virtual:
slave-label: compass-virtual
installer: compass
<<: *gambia
- - arm-virtual:
- slave-label: compass-arm-virtual
- installer: compass
- <<: *gambia
# apex CI PODs
- virtual:
slave-label: apex-virtual-master
@@ -131,123 +74,15 @@
slave-label: apex-baremetal-master
installer: apex
<<: *gambia
- - virtual:
- slave-label: apex-virtual-fraser
- installer: apex
- <<: *fraser
- - baremetal:
- slave-label: apex-baremetal-fraser
- installer: apex
- <<: *fraser
# armband CI PODs
- armband-baremetal:
slave-label: armband-baremetal
installer: fuel
<<: *master
- - armband-virtual:
- slave-label: armband-virtual
- installer: fuel
- <<: *master
- armband-baremetal:
slave-label: armband-baremetal
installer: fuel
<<: *gambia
- - armband-virtual:
- slave-label: armband-virtual
- installer: fuel
- <<: *gambia
- - armband-baremetal:
- slave-label: armband-baremetal
- installer: fuel
- <<: *fraser
- - armband-virtual:
- slave-label: armband-virtual
- installer: fuel
- <<: *fraser
- # daisy CI PODs
- - baremetal:
- slave-label: daisy-baremetal
- installer: daisy
- <<: *master
- - virtual:
- slave-label: daisy-virtual
- installer: daisy
- <<: *master
- - baremetal:
- slave-label: daisy-baremetal
- installer: daisy
- <<: *fraser
- - virtual:
- slave-label: daisy-virtual
- installer: daisy
- <<: *fraser
- # netvirt 3rd party ci
- - virtual:
- slave-label: odl-netvirt-virtual
- installer: netvirt
- <<: *master
- # -------------------------------
- # None-CI PODs
- # -------------------------------
- - orange-pod1:
- slave-label: '{pod}'
- installer: joid
- <<: *master
- - orange-pod5:
- slave-label: '{pod}'
- installer: fuel
- <<: *master
- - orange-pod2:
- slave-label: '{pod}'
- installer: joid
- <<: *master
- - baremetal-centos:
- slave-label: 'intel-pod8'
- installer: compass
- <<: *master
- - nokia-pod1:
- slave-label: '{pod}'
- installer: apex
- <<: *master
- - zte-pod1:
- slave-label: '{pod}'
- installer: fuel
- <<: *master
- - zte-pod1:
- slave-label: '{pod}'
- installer: fuel
- <<: *fraser
- - zte-pod2:
- slave-label: '{pod}'
- installer: daisy
- <<: *master
- - zte-pod2:
- slave-label: '{pod}'
- installer: daisy
- <<: *fraser
- - zte-pod3:
- slave-label: '{pod}'
- installer: daisy
- <<: *master
- - zte-pod3:
- slave-label: '{pod}'
- installer: daisy
- <<: *fraser
- - zte-pod9:
- slave-label: '{pod}'
- installer: daisy
- <<: *master
- - zte-pod9:
- slave-label: '{pod}'
- installer: daisy
- <<: *fraser
- # -------------------------------
- # PODs for verify jobs triggered by each patch upload
- # - ool-virtual1:
- # slave-label: '{pod}'
- # installer: apex
- # <<: *master
- # -------------------------------
testsuite:
- 'suite':
diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 71215cae1..d831db5c5 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -18,9 +18,6 @@
- gambia:
branch: 'stable/{stream}'
disabled: false
- - fraser:
- branch: 'stable/{stream}'
- disabled: false
arch_tag:
- 'amd64':
@@ -35,7 +32,6 @@
- 'healthcheck'
- 'features'
- 'components'
- - 'parser'
- 'smoke'
- 'benchmarking'
- 'vnf'
@@ -45,16 +41,6 @@
image: 'components'
- stream: 'hunter'
image: 'components'
- - stream: 'master'
- image: 'parser'
- - stream: 'hunter'
- image: 'parser'
- - stream: 'gambia'
- image: 'parser'
- - stream: 'fraser'
- image: 'tempest'
- - stream: 'fraser'
- image: 'benchmarking'
# settings for jobs run in multijob phases
build-job-settings: &build-job-settings
@@ -161,10 +147,6 @@
<<: *build-job-settings
- name: 'functest-components-docker-build-arm64-{stream}'
<<: *build-job-settings
- - name: 'functest-parser-docker-build-amd64-{stream}'
- <<: *build-job-settings
- - name: 'functest-parser-docker-build-arm64-{stream}'
- <<: *build-job-settings
- name: 'functest-smoke-docker-build-amd64-{stream}'
<<: *build-job-settings
- name: 'functest-smoke-docker-build-arm64-{stream}'
@@ -188,8 +170,6 @@
<<: *manifest-job-settings
- name: 'functest-components-docker-manifest-{stream}'
<<: *manifest-job-settings
- - name: 'functest-parser-docker-manifest-{stream}'
- <<: *manifest-job-settings
- name: 'functest-smoke-docker-manifest-{stream}'
<<: *manifest-job-settings
- name: 'functest-benchmarking-docker-manifest-{stream}'
diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml
index c328f5d86..9a074dae6 100644
--- a/jjb/functest/functest-kubernetes-docker.yaml
+++ b/jjb/functest/functest-kubernetes-docker.yaml
@@ -18,9 +18,6 @@
- gambia:
branch: 'stable/{stream}'
disabled: false
- - fraser:
- branch: 'stable/{stream}'
- disabled: false
arch_tag:
- 'amd64':
diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml
index 46b77ce68..6dcd8803a 100644
--- a/jjb/functest/functest-kubernetes-project-jobs.yaml
+++ b/jjb/functest/functest-kubernetes-project-jobs.yaml
@@ -26,10 +26,6 @@
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
- - fraser: &fraser
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
phase:
- 'unit-tests-and-docs':
diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml
index e9a65b495..35a18cf39 100644
--- a/jjb/functest/functest-project-jobs.yaml
+++ b/jjb/functest/functest-project-jobs.yaml
@@ -26,10 +26,6 @@
branch: 'stable/{stream}'
gs-pathname: ''
disabled: false
- - fraser: &fraser
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
phase:
- 'unit-tests-and-docs':
diff --git a/jjb/functest/functest-weekly-jobs.yaml b/jjb/functest/functest-weekly-jobs.yaml
deleted file mode 100644
index c88fa0050..000000000
--- a/jjb/functest/functest-weekly-jobs.yaml
+++ /dev/null
@@ -1,128 +0,0 @@
----
-###################################
-# job configuration for functest
-###################################
-- project:
- name: functest-weekly
-
- project: functest
-
- # -------------------------------
- # BRANCH ANCHORS
- # -------------------------------
- master: &master
- stream: master
- branch: '{stream}'
- gs-pathname: ''
- docker-tag: 'latest'
- disabled: false
- fraser: &fraser
- stream: fraser
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- docker-tag: '{stream}'
- disabled: false
- # -------------------------------
- # POD, INSTALLER, AND BRANCH MAPPING
- # -------------------------------
- # Installers using labels
- # CI PODs
- # This section should only contain the installers
- # that have been switched using labels for slaves
- # -------------------------------
- pod:
- # fuel CI PODs
- - baremetal:
- slave-label: fuel-baremetal
- installer: fuel
- <<: *master
- - virtual:
- slave-label: fuel-virtual
- installer: fuel
- <<: *master
- - baremetal:
- slave-label: fuel-baremetal
- installer: fuel
- <<: *fraser
- - virtual:
- slave-label: fuel-virtual
- installer: fuel
- <<: *fraser
- # -------------------------------
- jobs:
- - 'functest-{installer}-{pod}-weekly-{stream}'
-
-################################
-# job template
-################################
-- job-template:
- name: 'functest-{installer}-{pod}-weekly-{stream}'
-
- disabled: '{obj:disabled}'
-
- concurrent: true
-
- properties:
- - logrotate-default
- - throttle:
- enabled: true
- max-per-node: 1
- option: 'project'
-
- wrappers:
- - build-name:
- name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
- - timeout:
- timeout: '400'
- abort: true
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - '{installer}-defaults'
- - '{slave-label}-defaults'
- - string:
- name: FUNCTEST_SUITE_NAME
- default: 'weekly'
- description: "Weekly suite name to run"
- - string:
- name: DEPLOY_SCENARIO
- default: 'os-odl_l2-nofeature-ha'
- - string:
- name: DOCKER_TAG
- default: '{docker-tag}'
- description: 'Tag to pull docker image'
- - string:
- name: CLEAN_DOCKER_IMAGES
- default: 'false'
- description: 'Remove downloaded docker images (opnfv/functest*:*)'
- - functest-parameter:
- gs-pathname: '{gs-pathname}'
-
- scm:
- - git-scm
-
- builders:
- - description-setter:
- description: "Built on $NODE_NAME"
- - 'functest-weekly-builder'
-########################
-# builder macros
-########################
-- builder:
- name: functest-weekly-builder
- builders:
- - shell:
- !include-raw: ./functest-cleanup.sh
- # yamllint disable rule:indentation
- - shell:
- !include-raw:
- - ./functest-env-presetup.sh
- - ../../utils/fetch_os_creds.sh
- - ./functest-alpine.sh
- # yamllint enable rule:indentation
- - shell:
- !include-raw: ../../utils/push-test-logs.sh
- - shell:
- !include-raw: ./functest-exit.sh
diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml
index 88416bbf9..f45e25cab 100644
--- a/jjb/functest/xtesting-docker.yaml
+++ b/jjb/functest/xtesting-docker.yaml
@@ -18,9 +18,6 @@
- gambia:
branch: 'stable/{stream}'
disabled: false
- - fraser:
- branch: 'stable/{stream}'
- disabled: false
arch_tag:
- 'amd64':
diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml
index 239ae9f9b..e141f7865 100644
--- a/jjb/functest/xtesting-project-jobs.yaml
+++ b/jjb/functest/xtesting-project-jobs.yaml
@@ -26,10 +26,6 @@
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
- - fraser: &fraser
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
phase:
- 'unit-tests-and-docs':