diff options
Diffstat (limited to 'jjb/functest')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 18 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yaml | 21 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 3 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes-docker.yaml | 3 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes-project-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/functest/functest-rtd-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/functest/xtesting-docker.yaml | 3 | ||||
| -rw-r--r-- | jjb/functest/xtesting-project-jobs.yaml | 4 |
9 files changed, 5 insertions, 57 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 4f3c9ef98..9961f717e 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -243,12 +243,6 @@ compute: max_microversion: 2.65 EOF ;; -stable/gambia) - cat << EOF >> "${tempest_conf_yaml}" -compute: - max_microversion: 2.60 -EOF - ;; esac echo "tempest_conf.yaml:" && cat "${tempest_conf_yaml}" @@ -302,17 +296,9 @@ else tests=() skip_tests=0 if [ "${HOST_ARCH}" != "aarch64" ]; then - if [[ ${BRANCH} == "stable/gambia" ]]; then - tiers=(healthcheck smoke benchmarking features vnf components) - else - tiers=(healthcheck smoke benchmarking features vnf) - fi + tiers=(healthcheck smoke benchmarking features vnf) else - if [[ ${BRANCH} == "stable/gambia" ]]; then - tiers=(healthcheck smoke benchmarking features components) - else - tiers=(healthcheck smoke benchmarking features) - fi + tiers=(healthcheck smoke benchmarking features) fi run_tiers ${tiers} if [ ${skip_tests} -eq 0 ]; then diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index aefc214cc..e1f15fd93 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -14,8 +14,8 @@ stream: master branch: '{stream}' gs-pathname: '' - gambia: &gambia - stream: gambia + iruya: &iruya + stream: iruya branch: 'stable/{stream}' gs-pathname: '/{stream}' hunter: &hunter @@ -48,15 +48,6 @@ slave-label: fuel-virtual installer: fuel <<: *hunter - # compass CI PODs - - baremetal: - slave-label: compass-baremetal - installer: compass - <<: *gambia - - virtual: - slave-label: compass-virtual - installer: compass - <<: *gambia # apex CI PODs - virtual: slave-label: apex-virtual-master @@ -74,14 +65,6 @@ slave-label: apex-baremetal-master installer: apex <<: *hunter - - virtual: - slave-label: apex-virtual-master - installer: apex - <<: *gambia - - baremetal: - slave-label: apex-baremetal-master - installer: apex - <<: *gambia # armband CI PODs - armband-baremetal: slave-label: armband-baremetal diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 328ef7c6c..561296000 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -18,9 +18,6 @@ - hunter: branch: 'stable/{stream}' disabled: false - - gambia: - branch: 'stable/{stream}' - disabled: false arch_tag: - 'amd64': diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml index c70aae35b..c8c55e742 100644 --- a/jjb/functest/functest-kubernetes-docker.yaml +++ b/jjb/functest/functest-kubernetes-docker.yaml @@ -18,9 +18,6 @@ - hunter: branch: 'stable/{stream}' disabled: false - - gambia: - 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 161469bce..178df6a9e 100644 --- a/jjb/functest/functest-kubernetes-project-jobs.yaml +++ b/jjb/functest/functest-kubernetes-project-jobs.yaml @@ -25,10 +25,6 @@ branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - gambia: &gambia - 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 405202ecd..69df265dc 100644 --- a/jjb/functest/functest-project-jobs.yaml +++ b/jjb/functest/functest-project-jobs.yaml @@ -25,10 +25,6 @@ branch: 'stable/{stream}' gs-pathname: '' disabled: false - - gambia: - branch: 'stable/{stream}' - gs-pathname: '' - disabled: false phase: - 'unit-tests-and-docs': diff --git a/jjb/functest/functest-rtd-jobs.yaml b/jjb/functest/functest-rtd-jobs.yaml index b145ca7c2..8d20dd20e 100644 --- a/jjb/functest/functest-rtd-jobs.yaml +++ b/jjb/functest/functest-rtd-jobs.yaml @@ -16,7 +16,7 @@ - iruya: branch: 'stable/{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml index 4847bbd9c..510a55ea3 100644 --- a/jjb/functest/xtesting-docker.yaml +++ b/jjb/functest/xtesting-docker.yaml @@ -18,9 +18,6 @@ - hunter: branch: 'stable/{stream}' disabled: false - - gambia: - 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 830740151..39e73b719 100644 --- a/jjb/functest/xtesting-project-jobs.yaml +++ b/jjb/functest/xtesting-project-jobs.yaml @@ -25,10 +25,6 @@ branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - gambia: &gambia - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false phase: - 'unit-tests-and-docs': |