From 05807a01d3aeb8716bc277e8e6802bad7e5bb3fd Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 14 Jan 2019 18:57:56 +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: I4c8fdf209fd4f9fd8b10342a86453ff5e1cb5b09 Signed-off-by: Cédric Ollivier --- ansible/site.yml | 2 +- ci/daily.yaml | 32 ----------------------------- ci/gate.yaml | 62 -------------------------------------------------------- ci/globals.yaml | 10 --------- ci/run.yaml | 20 ------------------ 5 files changed, 1 insertion(+), 125 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/ansible/site.yml b/ansible/site.yml index 4c1f495e..ad13f6f1 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -1,4 +1,4 @@ --- -- hosts: 127.0.0.1 +- hosts: opnfv roles: - collivier.xtesting diff --git a/ci/daily.yaml b/ci/daily.yaml deleted file mode 100644 index 3bf90e4c..00000000 --- a/ci/daily.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- job-template: - name: '{repo}-xtesting-{tag}-pull' - builders: - - shell: docker pull {repo}/xtesting:{tag} - -- project: - name: '{repo}-xtesting-{tag}-pull' - jobs: - - '{repo}-xtesting-{tag}-pull' - -- job-template: - name: '{repo}-xtesting-{tag}-daily' - project-type: multijob - builders: - - multijob: - name: pull container - projects: - - name: '{repo}-xtesting-{tag}-pull' - - multijob: - name: samples - projects: - - name: '{repo}-xtesting-first-{tag}-run' - - name: '{repo}-xtesting-second-{tag}-run' - - name: '{repo}-xtesting-third-{tag}-run' - - name: '{repo}-xtesting-fourth-{tag}-run' - - name: '{repo}-xtesting-fifth-{tag}-run' - -- project: - name: '{repo}-xtesting-{tag}-daily' - jobs: - - '{repo}-xtesting-{tag}-daily' diff --git a/ci/gate.yaml b/ci/gate.yaml deleted file mode 100644 index 32818efe..00000000 --- a/ci/gate.yaml +++ /dev/null @@ -1,62 +0,0 @@ ---- -- xtesting-buildparameters: &xtesting-buildparameters - name: 'xtesting-buildparameters' - parameters: - - string: - name: branch - default: '{branch}' - -- xtesting-projectparameters: &xtesting-projectparameters - name: 'xtesting-projectparameters' - current-parameters: true - -- scm: - name: xtesting-gerrit - scm: - - git: - url: https://gerrit.opnfv.org/gerrit/functest-xtesting - refspec: '+refs/changes/*:refs/changes/*' - branches: - - ${branch} - -- job-template: - name: '{repo}-xtesting-{tag}-build' - <<: *xtesting-buildparameters - scm: - - xtesting-gerrit - builders: - - shell: | - cd docker - docker build \ - --pull=false --no-cache --force-rm=true \ - --build-arg BRANCH=${{branch}} \ - -t {repo}/xtesting:{tag} . - -- project: - name: '{repo}-xtesting-{tag}-build' - jobs: - - '{repo}-xtesting-{tag}-build' - -- job-template: - name: '{repo}-xtesting-{tag}-gate' - project-type: multijob - <<: *xtesting-buildparameters - builders: - - multijob: - name: build container - projects: - - name: '{repo}-xtesting-{tag}-build' - <<: *xtesting-projectparameters - - multijob: - name: samples - projects: - - name: '{repo}-xtesting-first-{tag}-run' - - name: '{repo}-xtesting-second-{tag}-run' - - name: '{repo}-xtesting-third-{tag}-run' - - name: '{repo}-xtesting-fourth-{tag}-run' - - name: '{repo}-xtesting-fifth-{tag}-run' - -- project: - name: '{repo}-xtesting-{tag}-gate' - jobs: - - '{repo}-xtesting-{tag}-gate' diff --git a/ci/globals.yaml b/ci/globals.yaml deleted file mode 100644 index 5fd895d0..00000000 --- a/ci/globals.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- defaults: - name: global - repo: 'opnfv' - branch: 'master' - tag: 'latest' - -- defaults: - name: xtesting-defaults - prefix: '/home/opnfv/xtesting' diff --git a/ci/run.yaml b/ci/run.yaml deleted file mode 100644 index 8b8732b5..00000000 --- a/ci/run.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- job-template: - name: '{repo}-xtesting-{test}-{tag}-run' - defaults: 'xtesting-defaults' - builders: - - shell: | - docker run \ - -v {prefix}/results/$JOB_NAME-$BUILD_ID:/var/lib/xtesting/results \ - {repo}/xtesting:{tag} run_tests -t {test} - -- project: - name: '{repo}-xtesting-{test}-{tag}-run' - test: - - first - - second - - third - - fourth - - fifth - jobs: - - '{repo}-xtesting-{test}-{tag}-run' -- cgit 1.2.3-korg