From: Alexandru Avadanii Date: Mon, 11 Feb 2019 18:45:20 +0000 (+0000) Subject: Merge "[fuel] Docker: create manifest for saltminion-maas" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=3f4e84a7401973f6449ff38f3ed4224a2572771a;hp=33f3ebae8fddc760d6deebf31f9cd30994d64df8 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 1bdc956ea..db0a1a9e7 100644 --- 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 `_ - - Armband - - Ubuntu 16.04 - - `PDF `__ - - `IDF `__ * - `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 b58b0fc9b..ad168653e 100644 --- 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 `_ - aarch64 - - CentOS 7.4 - - `Armband ENEA Team`_ - * - `arm-build5 `_ - - aarch64 - - CentOS 7.4 - - `Armband ENEA Team`_ - * - `arm-build6 `_ - - aarch64 - - CentOS 7.4 + - Ubuntu 16.04 - `Armband ENEA Team`_ * - `ericsson-build3 `_ - x86_64 diff --git a/docs/ci/tables/none-ci-servers.rst b/docs/ci/tables/none-ci-servers.rst index c4f403a64..48cf97b50 100644 --- 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 `_ - - Armband - - Ubuntu 16.04 - - `PDF `__ - - `IDF `__ * - cacti-pod1 - - diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml index 568cb9b9d..a100f49b4 100644 --- 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 130400899..70d2f1171 100644 --- 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 0b44a0233..d7a646ad0 100644 --- 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 f90c5ef3a..982b83e09 100644 --- 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 fe27897c3..869489098 100644 --- 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 d40ef984f..7f42c0771 100644 --- 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 d31823770..4678e4fa1 100644 --- 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 19967e9fd..03ef43629 100644 --- 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 ac5d1956e..e28d0be6f 100644 --- 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 63a1ecc0d..3a8b71856 100644 --- 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' \