Merge "Update the CI pod info"

diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml
index 568cb9b..a100f49 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yaml
+++ b/jjb/armband/armband-ci-jobs.yaml
@@ -23,7 +23,7 @@
       stream: gambia
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
-      disabled: false
+      disabled: true
       functest_docker_tag: '{stream}'
     # -------------------------------
     # DEPLOY TYPE ANCHORS

diff --git a/jjb/armband/armband-rtd-jobs.yaml b/jjb/armband/armband-rtd-jobs.yaml
index 1304008..70d2f11 100644 (file)
--- a/jjb/armband/armband-rtd-jobs.yaml
+++ b/jjb/armband/armband-rtd-jobs.yaml
@@ -14,7 +14,7 @@
           disabled: false
       - gambia:
           branch: 'stable/{stream}'
-          disabled: false
+          disabled: true
 
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/armband/armband-verify-jobs.yaml b/jjb/armband/armband-verify-jobs.yaml
index 0b44a02..d7a646a 100644 (file)
--- a/jjb/armband/armband-verify-jobs.yaml
+++ b/jjb/armband/armband-verify-jobs.yaml
@@ -15,7 +15,7 @@
       - gambia:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
-          disabled: false
+          disabled: true
     #####################################
     # jobs
     #####################################

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index f90c5ef..982b83e 100644 (file)
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -26,7 +26,7 @@
     gambia: &gambia
       stream: gambia
       branch: 'stable/{stream}'
-      disabled: false
+      disabled: true
       gs-pathname: '/{stream}'
       functest_docker_tag: '{stream}'
     # -------------------------------

diff --git a/jjb/fuel/fuel-docker-jobs.yaml b/jjb/fuel/fuel-docker-jobs.yaml
index ae80c44..20e9581 100644 (file)
--- a/jjb/fuel/fuel-docker-jobs.yaml
+++ b/jjb/fuel/fuel-docker-jobs.yaml
@@ -14,7 +14,7 @@
           disabled: false
       - gambia:
           branch: 'stable/{stream}'
-          disabled: false
+          disabled: true
 
     arch_tag:
       - 'amd64':

diff --git a/jjb/fuel/fuel-rtd-jobs.yaml b/jjb/fuel/fuel-rtd-jobs.yaml
index d40ef98..7f42c07 100644 (file)
--- a/jjb/fuel/fuel-rtd-jobs.yaml
+++ b/jjb/fuel/fuel-rtd-jobs.yaml
@@ -14,7 +14,7 @@
           disabled: false
       - gambia:
           branch: 'stable/{stream}'
-          disabled: false
+          disabled: true
 
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml
index d318237..4678e4f 100644 (file)
--- a/jjb/fuel/fuel-verify-jobs.yaml
+++ b/jjb/fuel/fuel-verify-jobs.yaml
@@ -17,7 +17,7 @@
       - gambia:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
-          disabled: false
+          disabled: true
           functest_docker_tag: '{stream}'
     #####################################
     # cluster architectures

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 667fc7b..52f65ba 100755 (executable)
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -55,13 +55,13 @@ run_test() {
     cmd_opt="run_tests -t ${test_name}"
     # Determine which Functest image should be used for the test case
     case ${test_name} in
-        connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check)
+        connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check|tempest_smoke)
             FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;;
-        tempest_smoke_serial|tempest_smoke|neutron-tempest-plugin-api|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican)
+        neutron-tempest-plugin-api|rally_sanity|refstack_defcore|tempest_full|tempest_scenario|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican)
             FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;;
-        shaker|vmtp)
+        rally_jobs|shaker|vmtp)
             FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;;
-        tempest_full_parallel|tempest_full|tempest_scenario|rally_full)
+        rally_full)
             FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;;
         cloudify|cloudify_ims|heat_ims|vyos_vrouter|juju_epc)
             FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;;

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 19967e9..03ef436 100644 (file)
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -41,6 +41,8 @@
       - 'vnf'
 
     exclude:
+      - stream: 'master'
+        image: 'components'
       - stream: 'master'
         image: 'parser'
       - stream: 'hunter'

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index ae9a8b7..2433594 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -10,6 +10,8 @@
     tag:
       - latest:
           branch: master
+      - hunter:
+          branch: stable/hunter
 
 - parameter:
     name: functest-slave