From 0c6102eaa36347ca73035c2956fa6ad6cfea0c11 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 23 Nov 2016 08:49:08 -0500 Subject: [PATCH] ceph-ansible-prs-* remove dirs per job. Templates take care of it now Signed-off-by: Alfredo Deza --- ceph-ansible-prs-centos7-cluster/build/build | 10 --- .../build/teardown | 13 ---- .../ceph-ansible-prs-centos7-cluster.yml | 62 ------------------- ceph-ansible-prs-xenial-cluster/build/build | 10 --- .../build/teardown | 13 ---- .../ceph-ansible-prs-xenial-cluster.yml | 62 ------------------- 6 files changed, 170 deletions(-) delete mode 100644 ceph-ansible-prs-centos7-cluster/build/build delete mode 100644 ceph-ansible-prs-centos7-cluster/build/teardown delete mode 100644 ceph-ansible-prs-centos7-cluster/config/definitions/ceph-ansible-prs-centos7-cluster.yml delete mode 100644 ceph-ansible-prs-xenial-cluster/build/build delete mode 100644 ceph-ansible-prs-xenial-cluster/build/teardown delete mode 100644 ceph-ansible-prs-xenial-cluster/config/definitions/ceph-ansible-prs-xenial-cluster.yml diff --git a/ceph-ansible-prs-centos7-cluster/build/build b/ceph-ansible-prs-centos7-cluster/build/build deleted file mode 100644 index 38c85a8d..00000000 --- a/ceph-ansible-prs-centos7-cluster/build/build +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# the following two methods exist in scripts/build_utils.sh -pkgs=( "tox" ) -install_python_packages "pkgs[@]" - -# XXX this might not be needed -source $VENV/activate - -$VENV/tox -rv -e=ansible2.2-centos7-cluster -- --provider=libvirt diff --git a/ceph-ansible-prs-centos7-cluster/build/teardown b/ceph-ansible-prs-centos7-cluster/build/teardown deleted file mode 100644 index 71026e6b..00000000 --- a/ceph-ansible-prs-centos7-cluster/build/teardown +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# There has to be a better way to do this than this script which just looks -# for every Vagrantfile in scenarios and then just destroys whatever is left. - -cd $WORKSPACE/tests - -scenarios=$(find . | grep Vagrantfile | xargs dirname) - -for scenario in $scenarios; do - cd $scenario - vagrant destroy -f - cd - -done diff --git a/ceph-ansible-prs-centos7-cluster/config/definitions/ceph-ansible-prs-centos7-cluster.yml b/ceph-ansible-prs-centos7-cluster/config/definitions/ceph-ansible-prs-centos7-cluster.yml deleted file mode 100644 index be9e16fe..00000000 --- a/ceph-ansible-prs-centos7-cluster/config/definitions/ceph-ansible-prs-centos7-cluster.yml +++ /dev/null @@ -1,62 +0,0 @@ -- job: - name: ceph-ansible-prs-centos7-cluster - node: vagrant&&ceph-ansible - concurrent: true - defaults: global - display-name: 'ceph-ansible: Pull Requests [centos7-cluster]' - quiet-period: 5 - block-downstream: false - block-upstream: false - retry-count: 3 - properties: - - github: - url: https://github.com/ceph/ceph-ansible - logrotate: - daysToKeep: 15 - numToKeep: 30 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - string: - name: sha1 - description: "A pull request ID, like 'origin/pr/72/head'" - - triggers: - - github-pull-request: - allow-whitelist-orgs-as-admins: true - org-list: - - ceph - trigger-phrase: 'jenkins test centos7-cluster' - only-trigger-phrase: false - github-hooks: true - permit-all: true - auto-close-on-fail: false - status-context: "Testing: centos7-cluster" - started-status: "Running: centos7-cluster" - success-status: "OK - centos7-cluster" - failure-status: "FAIL - centos7-cluster" - - scm: - - git: - url: https://github.com/ceph/ceph-ansible.git - branches: - - ${sha1} - refspec: +refs/pull/*:refs/remotes/origin/pr/* - browser: auto - timeout: 20 - skip-tag: true - wipe-workspace: false - - builders: - - shell: - !include-raw: - - ../../../scripts/build_utils.sh - - ../../build/build - - publishers: - - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True - builders: - - shell: !include-raw ../../build/teardown diff --git a/ceph-ansible-prs-xenial-cluster/build/build b/ceph-ansible-prs-xenial-cluster/build/build deleted file mode 100644 index 6a3bf06e..00000000 --- a/ceph-ansible-prs-xenial-cluster/build/build +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# the following two methods exist in scripts/build_utils.sh -pkgs=( "tox" ) -install_python_packages "pkgs[@]" - -# XXX this might not be needed -source $VENV/activate - -$VENV/tox -rv -e=ansible2.2-xenial-cluster -- --provider=libvirt diff --git a/ceph-ansible-prs-xenial-cluster/build/teardown b/ceph-ansible-prs-xenial-cluster/build/teardown deleted file mode 100644 index 71026e6b..00000000 --- a/ceph-ansible-prs-xenial-cluster/build/teardown +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# There has to be a better way to do this than this script which just looks -# for every Vagrantfile in scenarios and then just destroys whatever is left. - -cd $WORKSPACE/tests - -scenarios=$(find . | grep Vagrantfile | xargs dirname) - -for scenario in $scenarios; do - cd $scenario - vagrant destroy -f - cd - -done diff --git a/ceph-ansible-prs-xenial-cluster/config/definitions/ceph-ansible-prs-xenial-cluster.yml b/ceph-ansible-prs-xenial-cluster/config/definitions/ceph-ansible-prs-xenial-cluster.yml deleted file mode 100644 index 0ebe0700..00000000 --- a/ceph-ansible-prs-xenial-cluster/config/definitions/ceph-ansible-prs-xenial-cluster.yml +++ /dev/null @@ -1,62 +0,0 @@ -- job: - name: ceph-ansible-prs-xenial-cluster - node: vagrant&&ceph-ansible - concurrent: true - defaults: global - display-name: 'ceph-ansible: Pull Requests [xenial-cluster]' - quiet-period: 5 - block-downstream: false - block-upstream: false - retry-count: 3 - properties: - - github: - url: https://github.com/ceph/ceph-ansible - logrotate: - daysToKeep: 15 - numToKeep: 30 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - string: - name: sha1 - description: "A pull request ID, like 'origin/pr/72/head'" - - triggers: - - github-pull-request: - allow-whitelist-orgs-as-admins: true - org-list: - - ceph - trigger-phrase: 'jenkins test xenial-cluster' - only-trigger-phrase: false - github-hooks: true - permit-all: true - auto-close-on-fail: false - status-context: "Testing: xenial-cluster" - started-status: "Running: xenial-cluster" - success-status: "OK - xenial-cluster" - failure-status: "FAIL - xenial-cluster" - - scm: - - git: - url: https://github.com/ceph/ceph-ansible.git - branches: - - ${sha1} - refspec: +refs/pull/*:refs/remotes/origin/pr/* - browser: auto - timeout: 20 - skip-tag: true - wipe-workspace: false - - builders: - - shell: - !include-raw: - - ../../../scripts/build_utils.sh - - ../../build/build - - publishers: - - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True - builders: - - shell: !include-raw ../../build/teardown -- 2.39.5