From 0f39333c6f028d31d8b630e2a43809eb636d96eb Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 14 Jan 2019 18:55:57 +0100 Subject: Remove former ci jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They can now be generated via the new ansible role. Change-Id: I6ca1f14873b83a343e00a5d5a75a746ce9d0e6e8 Signed-off-by: Cédric Ollivier --- ci/daily.yaml | 53 ------------------------------- ci/gate.yaml | 96 --------------------------------------------------------- ci/globals.yaml | 10 ------ ci/run.yaml | 80 ----------------------------------------------- tox.ini | 1 - 5 files changed, 240 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 fad26e77..00000000 --- a/ci/daily.yaml +++ /dev/null @@ -1,53 +0,0 @@ ---- -- job-template: - name: '{repo}-functest-kubernetes-{container}-{tag}-pull' - builders: - - shell: docker pull {repo}/functest-kubernetes-{container}:{tag} - -- project: - name: '{repo}-functest-kubernetes-{container}-{tag}-pull' - container: - - healthcheck - - smoke - - features - jobs: - - '{repo}-functest-kubernetes-{container}-{tag}-pull' - -- job-template: - name: '{repo}-functest-kubernetes-{tag}-pull' - project-type: multijob - builders: - - multijob: - name: pull all containers - projects: - - name: '{repo}-functest-kubernetes-healthcheck-{tag}-pull' - - name: '{repo}-functest-kubernetes-smoke-{tag}-pull' - - name: '{repo}-functest-kubernetes-features-{tag}-pull' - -- project: - name: '{repo}-functest-kubernetes-{tag}-pull' - jobs: - - '{repo}-functest-kubernetes-{tag}-pull' - -- job-template: - name: '{repo}-functest-kubernetes-{tag}-daily' - project-type: multijob - builders: - - multijob: - name: pull containers - projects: - - name: '{repo}-functest-kubernetes-{tag}-pull' - - multijob: - name: basics tests - projects: - - name: '{repo}-functest-kubernetes-healthcheck-{tag}-run' - - multijob: - name: advanced tests - projects: - - name: '{repo}-functest-kubernetes-smoke-{tag}-run' - - name: '{repo}-functest-kubernetes-features-{tag}-run' - -- project: - name: '{repo}-functest-kubernetes-{tag}-daily' - jobs: - - '{repo}-functest-kubernetes-{tag}-daily' diff --git a/ci/gate.yaml b/ci/gate.yaml deleted file mode 100644 index 2efea236..00000000 --- a/ci/gate.yaml +++ /dev/null @@ -1,96 +0,0 @@ ---- -- functest-kubernetes-buildparameters: &functest-kubernetes-buildparameters - name: 'functest-kubernetes-buildparameters' - parameters: - - string: - name: branch - default: '{branch}' - -- projectparameters: &functest-kubernetes-projectparameters - name: 'functest-kubernetes-projectparameters' - current-parameters: true - -- scm: - name: functest-kubernetes-gerrit - scm: - - git: - url: https://gerrit.opnfv.org/gerrit/functest-kubernetes - refspec: '+refs/changes/*:refs/changes/*' - branches: - - ${branch} - -- job-template: - name: '{repo}-functest-kubernetes-{container}-{tag}-build' - <<: *functest-kubernetes-buildparameters - scm: - - functest-kubernetes-gerrit - builders: - - shell: | - cd docker/$(echo {container} |cut -d\- -f 2) - docker build \ - --pull=false --no-cache --force-rm=true \ - --build-arg BRANCH=${{branch}} \ - -t {repo}/functest-kubernetes-{container}:{tag} . - -- project: - name: '{repo}-functest-kubernetes-{container}-{tag}-build' - container: - - core - - healthcheck - - smoke - - features - jobs: - - '{repo}-functest-kubernetes-{container}-{tag}-build' - -- job-template: - name: '{repo}-functest-kubernetes-{tag}-build' - project-type: multijob - <<: *functest-kubernetes-buildparameters - builders: - - multijob: - name: build functest-kubernetes-core - projects: - - name: '{repo}-functest-kubernetes-core-{tag}-build' - <<: *functest-kubernetes-projectparameters - - multijob: - name: build functest-kubernetes-healthcheck - projects: - - name: '{repo}-functest-kubernetes-healthcheck-{tag}-build' - <<: *functest-kubernetes-projectparameters - - multijob: - name: build all remaining contrainers - projects: - - name: '{repo}-functest-kubernetes-smoke-{tag}-build' - <<: *functest-kubernetes-projectparameters - - name: '{repo}-functest-kubernetes-features-{tag}-build' - <<: *functest-kubernetes-projectparameters - -- project: - name: '{repo}-functest-kubernetes-{tag}-build' - jobs: - - '{repo}-functest-kubernetes-{tag}-build' - -- job-template: - name: '{repo}-functest-kubernetes-{tag}-gate' - project-type: multijob - <<: *functest-kubernetes-buildparameters - builders: - - multijob: - name: build containers - projects: - - name: '{repo}-functest-kubernetes-{tag}-build' - <<: *functest-kubernetes-projectparameters - - multijob: - name: basics tests - projects: - - name: '{repo}-functest-kubernetes-healthcheck-{tag}-run' - - multijob: - name: advanced tests - projects: - - name: '{repo}-functest-kubernetes-smoke-{tag}-run' - - name: '{repo}-functest-kubernetes-features-{tag}-run' - -- project: - name: '{repo}-functest-kubernetes-{tag}-gate' - jobs: - - '{repo}-functest-kubernetes-{tag}-gate' diff --git a/ci/globals.yaml b/ci/globals.yaml deleted file mode 100644 index 805852a5..00000000 --- a/ci/globals.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- defaults: - name: global - repo: 'opnfv' - branch: 'master' - tag: 'latest' - -- defaults: - name: functest-kubernetes-defaults - prefix: '/home/opnfv/functest' diff --git a/ci/run.yaml b/ci/run.yaml deleted file mode 100644 index 4bdd4d3e..00000000 --- a/ci/run.yaml +++ /dev/null @@ -1,80 +0,0 @@ ---- -- job-template: - name: '{repo}-functest-kubernetes-{container}-{test}-{tag}-run' - defaults: 'functest-kubernetes-defaults' - builders: - - shell: | - docker run \ - -e DEPLOY_SCENARIO=k8s \ - -v \ - {prefix}/results/$JOB_NAME-$BUILD_ID:/home/opnfv/functest/results \ - -v {prefix}/config:/root/.kube/config \ - {repo}/functest-kubernetes-{container}:{tag} run_tests -t {test} - -- project: - name: '{repo}-functest-kubernetes-healthcheck-{test}-{tag}-run' - container: healthcheck - test: - - k8s_smoke - jobs: - - '{repo}-functest-kubernetes-{container}-{test}-{tag}-run' - -- job-template: - name: '{repo}-functest-kubernetes-healthcheck-{tag}-run' - project-type: multijob - builders: - - multijob: - name: healthcheck - projects: - - name: '{repo}-functest-kubernetes-healthcheck-k8s_smoke-{tag}-run' - -- project: - name: '{repo}-functest-kubernetes-healthcheck-{tag}-run' - jobs: - - '{repo}-functest-kubernetes-healthcheck-{tag}-run' - -- project: - name: '{repo}-functest-kubernetes-smoke-{test}-{tag}-run' - container: smoke - test: - - k8s_conformance - jobs: - - '{repo}-functest-kubernetes-{container}-{test}-{tag}-run' - -- job-template: - name: '{repo}-functest-kubernetes-smoke-{tag}-run' - project-type: multijob - builders: - - multijob: - name: smoke - projects: - - name: '{repo}-functest-kubernetes-smoke-k8s_conformance-{tag}-run' - -- project: - name: '{repo}-functest-kubernetes-smoke-{tag}-run' - jobs: - - '{repo}-functest-kubernetes-smoke-{tag}-run' - -- project: - name: '{repo}-functest-kubernetes-features-{test}-{tag}-run' - container: features - test: - - stor4nfv_k8s - - clover_k8s - jobs: - - '{repo}-functest-kubernetes-{container}-{test}-{tag}-run' - -- job-template: - name: '{repo}-functest-kubernetes-features-{tag}-run' - project-type: multijob - builders: - - multijob: - name: features - projects: - - name: '{repo}-functest-kubernetes-features-stor4nfv_k8s-{tag}-run' - - name: '{repo}-functest-kubernetes-features-clover_k8s-{tag}-run' - -- project: - name: '{repo}-functest-kubernetes-features-{tag}-run' - jobs: - - '{repo}-functest-kubernetes-features-{tag}-run' diff --git a/tox.ini b/tox.ini index 2510dd41..a5caed57 100644 --- a/tox.ini +++ b/tox.ini @@ -33,7 +33,6 @@ commands = basepython = python2.7 files = .travis.yml - ci docker commands = yamllint {[testenv:yamllint]files} -- cgit 1.2.3-korg