Merge "Update Functest jobs to manage new branches"

diff --combined jjb/functest/functest-daily-jobs.yaml
index 763d1d4,afbabe0..9262988
--- 1/jjb/functest/functest-daily-jobs.yaml
--- 2/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@@ -18,6 -18,14 +18,14 @@@
        stream: fraser
        branch: 'stable/{stream}'
        gs-pathname: '/{stream}'
+     gambia: &gambia
+       stream: gambia
+       branch: 'stable/{stream}'
+       gs-pathname: '/{stream}'
+     hunter: &hunter
+       stream: hunter
+       branch: 'stable/{stream}'
+       gs-pathname: '/{stream}'
      # -------------------------------
      # POD, INSTALLER, AND BRANCH MAPPING
      # -------------------------------
@@@ -290,8 -298,6 +298,8 @@@
              - 'patrole'
              - 'odl'
              - 'snaps_smoke'
 +            - 'shaker'
 +            - 'vmtp'
              - 'neutron_trunk'
              - 'doctor-notification'
              - 'bgpvpn'
@@@ -310,7 -316,6 +318,7 @@@
            choices:
              - 'healthcheck'
              - 'smoke'
 +            - 'benchmarking'
              - 'features'
              - 'components'
              - 'vnf'

diff --combined jjb/functest/functest-docker.yaml
index fc2fd3c,1f10272..14134fa
--- 1/jjb/functest/functest-docker.yaml
--- 2/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@@ -12,6 -12,12 +12,12 @@@
        - master:
            branch: '{stream}'
            disabled: false
+       - hunter:
+           branch: 'stable/{stream}'
+           disabled: false
+       - gambia:
+           branch: 'stable/{stream}'
+           disabled: false
        - fraser:
            branch: 'stable/{stream}'
            disabled: false
@@@ -31,16 -37,17 +37,20 @@@
        - 'components'
        - 'parser'
        - 'smoke'
 +      - 'benchmarking'
        - 'vnf'
  
      exclude:
        - 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
@@@ -155,10 -162,6 +165,10 @@@
                <<: *build-job-settings
              - name: 'functest-smoke-docker-build-arm64-{stream}'
                <<: *build-job-settings
 +            - name: 'functest-benchmarking-docker-build-amd64-{stream}'
 +              <<: *build-job-settings
 +            - name: 'functest-benchmarking-docker-build-arm64-{stream}'
 +              <<: *build-job-settings
              - name: 'functest-vnf-docker-build-amd64-{stream}'
                <<: *build-job-settings
              - name: 'functest-vnf-docker-build-arm64-{stream}'
@@@ -177,8 -180,6 +187,8 @@@
              - name: 'functest-parser-docker-manifest-{stream}'
                <<: *manifest-job-settings
              - name: 'functest-smoke-docker-manifest-{stream}'
 +              <<: *manifest-job-settings
 +            - name: 'functest-benchmarking-docker-manifest-{stream}'
                <<: *manifest-job-settings
              - name: 'functest-vnf-docker-manifest-{stream}'
                <<: *manifest-job-settings