Merge "[fuel] Docker: create manifest for saltminion-maas"

diff --git a/docs/ci/tables/ci-baremetal-servers.rst b/docs/ci/tables/ci-baremetal-servers.rst
index 1bdc956..db0a1a9 100644 (file)
--- a/docs/ci/tables/ci-baremetal-servers.rst
+++ b/docs/ci/tables/ci-baremetal-servers.rst
@@ -11,11 +11,6 @@
      - Jumphost OS / Version
      - PDF
      - IDF
-   * - `arm-pod6 <https://build.opnfv.org/ci/computer/arm-pod6>`_
-     - Armband
-     - Ubuntu 16.04
-     - `PDF <https://git.opnfv.org/pharos/plain/labs/arm/pod6.yaml>`__
-     - `IDF <https://git.opnfv.org/pharos/plain/labs/arm/idf-pod6.yaml>`__
    * - `arm-pod9 <https://build.opnfv.org/ci/computer/arm-pod9>`_
      - Armband
      - Ubuntu 16.04

diff --git a/docs/ci/tables/ci-build-servers.rst b/docs/ci/tables/ci-build-servers.rst
index b58b0fc..ad16865 100644 (file)
--- a/docs/ci/tables/ci-build-servers.rst
+++ b/docs/ci/tables/ci-build-servers.rst
@@ -16,15 +16,7 @@
      - `Armband ENEA Team`_
    * - `arm-build4 <https://build.opnfv.org/ci/computer/arm-build4>`_
      - aarch64
-     - CentOS 7.4
-     - `Armband ENEA Team`_
-   * - `arm-build5 <https://build.opnfv.org/ci/computer/arm-build5>`_
-     - aarch64
-     - CentOS 7.4
-     - `Armband ENEA Team`_
-   * - `arm-build6 <https://build.opnfv.org/ci/computer/arm-build6>`_
-     - aarch64
-     - CentOS 7.4
+     - Ubuntu 16.04
      - `Armband ENEA Team`_
    * - `ericsson-build3 <https://build.opnfv.org/ci/computer/ericsson-build3>`_
      - x86_64

diff --git a/docs/ci/tables/none-ci-servers.rst b/docs/ci/tables/none-ci-servers.rst
index c4f403a..48cf97b 100644 (file)
--- a/docs/ci/tables/none-ci-servers.rst
+++ b/docs/ci/tables/none-ci-servers.rst
@@ -11,11 +11,6 @@
      - Jumphost OS / Version
      - PDF
      - IDF
-   * - `arm-pod5 <https://build.opnfv.org/ci/computer/arm-pod5>`_
-     - Armband
-     - Ubuntu 16.04
-     - `PDF <https://git.opnfv.org/pharos/plain/labs/arm/pod5.yaml>`__
-     - `IDF <https://git.opnfv.org/pharos/plain/labs/arm/idf-pod5.yaml>`__
    * - cacti-pod1
      -
      -

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 fe27897..8694890 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-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/pharos/pharos-tools.yml b/jjb/pharos/pharos-tools.yml
index ac5d195..e28d0be 100644 (file)
--- a/jjb/pharos/pharos-tools.yml
+++ b/jjb/pharos/pharos-tools.yml
@@ -3,14 +3,33 @@
     name: pharos-dashboard-jobs
 
     project: 'pharos-tools'
+    project-name: 'pharos-tools'
+
+    stream:
+      - master
 
     disabled: false
 
     jobs:
-      - '{project}-verify-basic'
       - 'pharos-dashboard-backup'
       - 'pharos-dashboard-deploy'
 
+- project:
+    name: pharos-dashboard-verify
+
+    project: 'pharos-tools'
+    project-name: 'pharos-tools'
+    build-days-to-keep: 7
+    tox-dir: 'dashboard'
+
+    stream:
+      - master
+
+    disabled: false
+
+    jobs:
+      - 'gerrit-tox-verify'
+
 - job-template:
     name: 'pharos-dashboard-backup'
 

diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh
index 63a1ecc..3a8b718 100644 (file)
--- a/utils/push-test-logs.sh
+++ b/utils/push-test-logs.sh
@@ -27,7 +27,7 @@ node_list=(\
 'ericsson-pod1' 'ericsson-pod2' \
 'ericsson-virtual1' 'ericsson-virtual2'  'ericsson-virtual3' \
 'ericsson-virtual4' 'ericsson-virtual5' \
-'arm-pod5' 'arm-pod6' 'arm-pod9' 'arm-pod10' \
+'arm-pod9' 'arm-pod10' \
 'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' \
 'huawei-pod6' 'huawei-pod7' 'huawei-pod12' 'huawei-pod8' \
 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4' \