From 12023f6a1a040c07f805553a1f5c65ab3940d638 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Mon, 14 Jan 2019 18:50:35 +0100
Subject: [PATCH 1/1] Remove former ci jobs
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

They can now be generated via the new ansible role.

Change-Id: I7746d08b940e8d6906cb023c39bc87d8dee441cc
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 ci/daily.yaml   |  66 ---------------
 ci/gate.yaml    | 116 ---------------------------
 ci/globals.yaml |  13 ---
 ci/run.yaml     | 243 --------------------------------------------------------
 tox.ini         |   1 -
 5 files changed, 439 deletions(-)
 delete mode 100644 ci/daily.yaml
 delete mode 100644 ci/gate.yaml
 delete mode 100644 ci/globals.yaml
 delete mode 100644 ci/run.yaml

diff --git a/ci/daily.yaml b/ci/daily.yaml
deleted file mode 100644
index 29db83d4a..000000000
--- a/ci/daily.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
----
-- job-template:
-    name: '{repo}-functest-{container}-{tag}-pull'
-    builders:
-      - shell: docker pull {repo}/functest-{container}:{tag}
-
-- project:
-    name: repo-functest-container-tag-pull
-    container:
-      - healthcheck
-      - smoke
-      - benchmarking
-      - components
-      - vnf
-      - features
-    jobs:
-      - '{repo}-functest-{container}-{tag}-pull'
-
-- functest-pulljobs: &functest-pulljobs
-    name: 'functest-pulljobs'
-    projects:
-      - name: '{repo}-functest-healthcheck-{tag}-pull'
-      - name: '{repo}-functest-smoke-{tag}-pull'
-      - name: '{repo}-functest-benchmarking-{tag}-pull'
-      - name: '{repo}-functest-components-{tag}-pull'
-      - name: '{repo}-functest-vnf-{tag}-pull'
-      - name: '{repo}-functest-features-{tag}-pull'
-
-- job-template:
-    name: '{repo}-functest-{tag}-pull'
-    project-type: multijob
-    builders:
-      - multijob:
-          name: pull all containers
-          <<: *functest-pulljobs
-
-- project:
-    name: repo-functest-tag-pull
-    jobs:
-      - '{repo}-functest-{tag}-pull'
-
-- job-template:
-    name: '{repo}-functest-{tag}-daily'
-    project-type: multijob
-    builders:
-      - multijob:
-          name: pull containers
-          projects:
-            - name: '{repo}-functest-{tag}-pull'
-      - multijob:
-          name: basics tests
-          projects:
-            - name: '{repo}-functest-healthcheck-{tag}-run'
-      - multijob:
-          name: advanced tests
-          projects:
-            - name: '{repo}-functest-smoke-{tag}-run'
-            - name: '{repo}-functest-benchmarking-{tag}-run'
-            - name: '{repo}-functest-components-{tag}-run'
-            - name: '{repo}-functest-vnf-{tag}-run'
-            - name: '{repo}-functest-features-{tag}-run'
-
-- project:
-    name: repo-functest-tag-daily
-    jobs:
-      - '{repo}-functest-{tag}-daily'
diff --git a/ci/gate.yaml b/ci/gate.yaml
deleted file mode 100644
index fa872c90a..000000000
--- a/ci/gate.yaml
+++ /dev/null
@@ -1,116 +0,0 @@
----
-- functest-buildparameters: &functest-buildparameters
-    name: 'functest-buildparameters'
-    parameters:
-      - string:
-          name: branch
-          default: '{branch}'
-
-- functest-projectparameters: &functest-projectparameters
-    name: 'functest-projectparameters'
-    current-parameters: true
-
-- scm:
-    name: functest-gerrit
-    scm:
-      - git:
-          url: https://gerrit.opnfv.org/gerrit/functest
-          refspec: '+refs/changes/*:refs/changes/*'
-          branches:
-            - ${branch}
-
-- job-template:
-    name: '{repo}-functest-{container}-{tag}-build'
-    <<: *functest-buildparameters
-    scm:
-      - functest-gerrit
-    builders:
-      - shell: |
-          case "{container}" in
-          "components")
-              args="" ;;
-          *)
-              args="--build-arg BRANCH=${{branch}}" ;;
-          esac
-          cd docker/$(echo {container} |cut -d\- -f 2)
-          sudo docker build \
-            ${{args}} --pull=false --no-cache --force-rm=true \
-            -t {repo}/functest-{container}:{tag} .
-
-- project:
-    name: repo-functest-container-tag-build
-    container:
-      - core
-      - tempest
-      - healthcheck
-      - smoke
-      - benchmarking
-      - components
-      - vnf
-      - features
-    jobs:
-      - '{repo}-functest-{container}-{tag}-build'
-
-- job-template:
-    name: '{repo}-functest-{tag}-build'
-    project-type: multijob
-    <<: *functest-buildparameters
-    builders:
-      - multijob:
-          name: build functest-core
-          projects:
-            - name: '{repo}-functest-core-{tag}-build'
-              <<: *functest-projectparameters
-      - multijob:
-          name: build functest-tempest
-          projects:
-            - name: '{repo}-functest-tempest-{tag}-build'
-              <<: *functest-projectparameters
-      - multijob:
-          name: build all remaining contrainers
-          projects:
-            - name: '{repo}-functest-healthcheck-{tag}-build'
-              <<: *functest-projectparameters
-            - name: '{repo}-functest-smoke-{tag}-build'
-              <<: *functest-projectparameters
-            - name: '{repo}-functest-benchmarking-{tag}-build'
-              <<: *functest-projectparameters
-            - name: '{repo}-functest-components-{tag}-build'
-              <<: *functest-projectparameters
-            - name: '{repo}-functest-vnf-{tag}-build'
-              <<: *functest-projectparameters
-            - name: '{repo}-functest-features-{tag}-build'
-              <<: *functest-projectparameters
-
-- project:
-    name: repo-functest-tag-build
-    jobs:
-      - '{repo}-functest-{tag}-build'
-
-- job-template:
-    name: '{repo}-functest-{tag}-gate'
-    project-type: multijob
-    <<: *functest-buildparameters
-    builders:
-      - multijob:
-          name: build containers
-          projects:
-            - name: '{repo}-functest-{tag}-build'
-              <<: *functest-projectparameters
-      - multijob:
-          name: basics tests
-          projects:
-            - name: '{repo}-functest-healthcheck-{tag}-run'
-      - multijob:
-          name: advanced tests
-          projects:
-            - name: '{repo}-functest-smoke-{tag}-run'
-            - name: '{repo}-functest-benchmarking-{tag}-run'
-            - name: '{repo}-functest-components-{tag}-run'
-            - name: '{repo}-functest-vnf-{tag}-run'
-            - name: '{repo}-functest-features-{tag}-run'
-
-- project:
-    name: repo-functest-tag-gate
-    jobs:
-      - '{repo}-functest-{tag}-gate'
diff --git a/ci/globals.yaml b/ci/globals.yaml
deleted file mode 100644
index 20217921f..000000000
--- a/ci/globals.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- defaults:
-    name: global
-    repo: 'opnfv'
-    branch: 'master'
-    tag: 'latest'
-
-- defaults:
-    name: functest-defaults
-    prefix: '/home/opnfv/functest'
-    nameserver: '8.8.8.8'
-    external_network: 'ext-net'
-    storage_protocol: 'iSCSI'
diff --git a/ci/run.yaml b/ci/run.yaml
deleted file mode 100644
index a1d233d3a..000000000
--- a/ci/run.yaml
+++ /dev/null
@@ -1,243 +0,0 @@
----
-- job-template:
-    name: '{repo}-functest-{container}-{test}-{tag}-run'
-    defaults: 'functest-defaults'
-    builders:
-      - shell: |
-          docker run \
-            -e NAMESERVER={nameserver} \
-            -e EXTERNAL_NETWORK={external_network} \
-            -v \
-            {prefix}/results/$JOB_NAME-$BUILD_ID:/home/opnfv/functest/results \
-            -v {prefix}/openstack.creds:/home/opnfv/functest/conf/env_file \
-            -v {prefix}/images:/home/opnfv/functest/images \
-            -v {prefix}/tempest_conf.yaml:\
-          /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack\
-          /tempest/custom_tests/tempest_conf.yaml \
-            {repo}/functest-{container}:{tag} run_tests -t {test}
-
-- project:
-    name: repo-functest-healthcheck-test-tag-run
-    container: healthcheck
-    test:
-      - connection_check
-      - tenantnetwork1
-      - tenantnetwork2
-      - vmready1
-      - vmready2
-      - singlevm1
-      - singlevm2
-      - vping_ssh
-      - vping_userdata
-      - cinder_test
-      - odl
-      - api_check
-      - snaps_health_check
-    jobs:
-      - '{repo}-functest-{container}-{test}-{tag}-run'
-
-- functest-healthcheckjobs: &functest-healthcheckjobs
-    name: 'functest-healthcheckjobs'
-    projects:
-      - name: '{repo}-functest-healthcheck-connection_check-{tag}-run'
-      - name: '{repo}-functest-healthcheck-tenantnetwork1-{tag}-run'
-      - name: '{repo}-functest-healthcheck-tenantnetwork2-{tag}-run'
-      - name: '{repo}-functest-healthcheck-vmready1-{tag}-run'
-      - name: '{repo}-functest-healthcheck-vmready2-{tag}-run'
-      - name: '{repo}-functest-healthcheck-singlevm1-{tag}-run'
-      - name: '{repo}-functest-healthcheck-singlevm2-{tag}-run'
-      - name: '{repo}-functest-healthcheck-vping_ssh-{tag}-run'
-      - name: '{repo}-functest-healthcheck-vping_userdata-{tag}-run'
-      - name: '{repo}-functest-healthcheck-cinder_test-{tag}-run'
-      - name: '{repo}-functest-healthcheck-odl-{tag}-run'
-      - name: '{repo}-functest-healthcheck-api_check-{tag}-run'
-      - name: '{repo}-functest-healthcheck-snaps_health_check-{tag}-run'
-
-- job-template:
-    name: '{repo}-functest-healthcheck-{tag}-run'
-    project-type: multijob
-    builders:
-      - multijob:
-          name: healthcheck
-          <<: *functest-healthcheckjobs
-
-- project:
-    name: repo-functest-healthcheck-tag-run
-    jobs:
-      - '{repo}-functest-healthcheck-{tag}-run'
-
-- project:
-    name: repo-functest-smoke-test-tag-run
-    container: smoke
-    test:
-      - tempest_smoke
-      - neutron-tempest-plugin-api
-      - rally_sanity
-      - rally_jobs
-      - refstack_defcore
-      - patrole
-      - snaps_smoke
-      - neutron_trunk
-      - networking-bgpvpn
-      - networking-sfc
-      - barbican
-    jobs:
-      - '{repo}-functest-{container}-{test}-{tag}-run'
-
-- functest-smokejobs: &functest-smokejobs
-    name: 'functest-smokejobs'
-    projects:
-      - name: '{repo}-functest-smoke-tempest_smoke-{tag}-run'
-      - name: '{repo}-functest-smoke-neutron-tempest-plugin-api-{tag}-run'
-      - name: '{repo}-functest-smoke-rally_sanity-{tag}-run'
-      - name: '{repo}-functest-smoke-rally_jobs-{tag}-run'
-      - name: '{repo}-functest-smoke-refstack_defcore-{tag}-run'
-      - name: '{repo}-functest-smoke-patrole-{tag}-run'
-      - name: '{repo}-functest-smoke-snaps_smoke-{tag}-run'
-      - name: '{repo}-functest-smoke-neutron_trunk-{tag}-run'
-      - name: '{repo}-functest-smoke-networking-bgpvpn-{tag}-run'
-      - name: '{repo}-functest-smoke-networking-sfc-{tag}-run'
-      - name: '{repo}-functest-smoke-barbican-{tag}-run'
-
-- job-template:
-    name: '{repo}-functest-smoke-{tag}-run'
-    project-type: multijob
-    builders:
-      - multijob:
-          name: smoke
-          <<: *functest-smokejobs
-
-- project:
-    name: 'repo-functest-smoke-tag-run'
-    jobs:
-      - '{repo}-functest-smoke-{tag}-run'
-
-- project:
-    name: 'repo-functest-benchmarking-test-tag-run'
-    container: benchmarking
-    test:
-      - vmtp
-      - shaker
-    jobs:
-      - '{repo}-functest-{container}-{test}-{tag}-run'
-
-- functest-benchmarkingjobs: &functest-benchmarkingjobs
-    name: 'functest-benchmarkingjobs'
-    projects:
-      - name: '{repo}-functest-benchmarking-vmtp-{tag}-run'
-      - name: '{repo}-functest-benchmarking-shaker-{tag}-run'
-
-- job-template:
-    name: '{repo}-functest-benchmarking-{tag}-run'
-    project-type: multijob
-    builders:
-      - multijob:
-          name: benchmarking
-          <<: *functest-benchmarkingjobs
-
-- project:
-    name: repo-functest-benchmarking-tag-run
-    jobs:
-      - '{repo}-functest-benchmarking-{tag}-run'
-
-- project:
-    name: repo-functest-components-test-tag-run
-    container: components
-    test:
-      - tempest_full
-      - tempest_scenario
-      - rally_full
-    jobs:
-      - '{repo}-functest-{container}-{test}-{tag}-run'
-
-- functest-componentsjobs: &functest-componentsjobs
-    name: 'functest-componentsjobs'
-    projects:
-      - name: '{repo}-functest-components-tempest_full-{tag}-run'
-      - name: '{repo}-functest-components-tempest_scenario-{tag}-run'
-      - name: '{repo}-functest-components-rally_full-{tag}-run'
-
-- job-template:
-    name: '{repo}-functest-components-{tag}-run'
-    project-type: multijob
-    builders:
-      - multijob:
-          name: components
-          <<: *functest-componentsjobs
-
-- project:
-    name: repo-functest-components-tag-run
-    jobs:
-      - '{repo}-functest-components-{tag}-run'
-
-- project:
-    name: repo-functest-vnf-test-tag-run
-    container: vnf
-    test:
-      - cloudify
-      - cloudify_ims
-      - heat_ims
-      - vyos_vrouter
-      - juju_epc
-    jobs:
-      - '{repo}-functest-{container}-{test}-{tag}-run'
-
-- functest-vnfjobs: &functest-vnfjobs
-    name: 'functest-vnfjobs'
-    projects:
-      - name: '{repo}-functest-vnf-cloudify-{tag}-run'
-      - name: '{repo}-functest-vnf-cloudify_ims-{tag}-run'
-      - name: '{repo}-functest-vnf-heat_ims-{tag}-run'
-      - name: '{repo}-functest-vnf-vyos_vrouter-{tag}-run'
-      - name: '{repo}-functest-vnf-juju_epc-{tag}-run'
-
-- job-template:
-    name: '{repo}-functest-vnf-{tag}-run'
-    project-type: multijob
-    builders:
-      - multijob:
-          name: vnf
-          <<: *functest-vnfjobs
-
-- project:
-    name: 'repo-functest-vnf-tag-run'
-    jobs:
-      - '{repo}-functest-vnf-{tag}-run'
-
-- project:
-    name: repo-functest-features-test-tag-run
-    container: features
-    test:
-      - doctor-notification
-      - bgpvpn
-      - functest-odl-sfc
-      - barometercollectd
-      - fds
-      - vgpu
-      - stor4nfv_os
-    jobs:
-      - '{repo}-functest-{container}-{test}-{tag}-run'
-
-- functest-featuresjobs: &functest-featuresjobs
-    name: 'functest-featuresjobs'
-    projects:
-      - name: '{repo}-functest-features-doctor-notification-{tag}-run'
-      - name: '{repo}-functest-features-bgpvpn-{tag}-run'
-      - name: '{repo}-functest-features-functest-odl-sfc-{tag}-run'
-      - name: '{repo}-functest-features-barometercollectd-{tag}-run'
-      - name: '{repo}-functest-features-fds-{tag}-run'
-      - name: '{repo}-functest-features-vgpu-{tag}-run'
-      - name: '{repo}-functest-features-stor4nfv_os-{tag}-run'
-
-- job-template:
-    name: '{repo}-functest-features-{tag}-run'
-    project-type: multijob
-    builders:
-      - multijob:
-          name: features
-          <<: *functest-featuresjobs
-
-- project:
-    name: repo-functest-features-tag-run
-    jobs:
-      - '{repo}-functest-features-{tag}-run'
diff --git a/tox.ini b/tox.ini
index 80b97374d..4b37077f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -76,7 +76,6 @@ commands =
 basepython = python2.7
 files =
   .travis.yml
-  ci
   docker
   functest/ci
   functest/opnfv_tests/openstack/rally/blacklist.yaml
-- 
2.16.6