From 58a483abf6ec6eff372b49d39d71f88c7680d629 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 6 Nov 2017 20:47:03 +0100 Subject: [PATCH] ceph-container: update project name roject name has been changed from `ceph-docker` to `ceph-container` Signed-off-by: Guillaume Abrioux --- .../build/build | 4 ++-- .../config/JENKINS_URL | 0 .../config/definitions/ceph-container-flake8.yml | 14 +++++++------- .../build/build | 4 ++-- .../config/JENKINS_URL | 0 .../config/definitions/ceph-container-lint.yml | 14 +++++++------- .../build/build | 0 .../build/teardown | 0 .../config/JENKINS_URL | 0 .../config/definitions/ceph-container-nightly.yml | 14 +++++++------- .../build/build | 0 .../build/teardown | 0 .../config/JENKINS_URL | 0 .../config/definitions/ceph-container-prs.yml | 12 ++++++------ 14 files changed, 31 insertions(+), 31 deletions(-) rename {ceph-docker-flake8 => ceph-container-flake8}/build/build (89%) rename {ceph-docker-flake8 => ceph-container-flake8}/config/JENKINS_URL (100%) rename ceph-docker-flake8/config/definitions/ceph-docker-flake8.yml => ceph-container-flake8/config/definitions/ceph-container-flake8.yml (81%) rename {ceph-docker-lint => ceph-container-lint}/build/build (91%) rename {ceph-docker-lint => ceph-container-lint}/config/JENKINS_URL (100%) rename ceph-docker-lint/config/definitions/ceph-docker-lint.yml => ceph-container-lint/config/definitions/ceph-container-lint.yml (81%) rename {ceph-docker-nightly => ceph-container-nighlity}/build/build (100%) rename {ceph-docker-nightly => ceph-container-nighlity}/build/teardown (100%) rename {ceph-docker-nightly => ceph-container-nighlity}/config/JENKINS_URL (100%) rename ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml => ceph-container-nighlity/config/definitions/ceph-container-nightly.yml (73%) rename {ceph-docker-prs => ceph-container-prs}/build/build (100%) rename {ceph-docker-prs => ceph-container-prs}/build/teardown (100%) rename {ceph-docker-prs => ceph-container-prs}/config/JENKINS_URL (100%) rename ceph-docker-prs/config/definitions/ceph-docker-prs.yml => ceph-container-prs/config/definitions/ceph-container-prs.yml (84%) diff --git a/ceph-docker-flake8/build/build b/ceph-container-flake8/build/build similarity index 89% rename from ceph-docker-flake8/build/build rename to ceph-container-flake8/build/build index e2682ef1..50991ddb 100755 --- a/ceph-docker-flake8/build/build +++ b/ceph-container-flake8/build/build @@ -8,7 +8,7 @@ function generate_filelist(){ then find . -name '*.py' else - curl -XGET "https://api.github.com/repos/ceph/ceph-docker/pulls/$pull_request_id/files" | + curl -XGET "https://api.github.com/repos/ceph/ceph-container/pulls/$pull_request_id/files" | jq '.[].filename' | # just the files please tr -d '"' | # remove the quoting from JSON grep ".py$" # just the python @@ -47,7 +47,7 @@ function main() { fi - pushd "$workspace/ceph-docker" + pushd "$workspace/ceph-container" generate_filelist | check popd exit $? diff --git a/ceph-docker-flake8/config/JENKINS_URL b/ceph-container-flake8/config/JENKINS_URL similarity index 100% rename from ceph-docker-flake8/config/JENKINS_URL rename to ceph-container-flake8/config/JENKINS_URL diff --git a/ceph-docker-flake8/config/definitions/ceph-docker-flake8.yml b/ceph-container-flake8/config/definitions/ceph-container-flake8.yml similarity index 81% rename from ceph-docker-flake8/config/definitions/ceph-docker-flake8.yml rename to ceph-container-flake8/config/definitions/ceph-container-flake8.yml index 7f0d29d5..f9f1c62a 100644 --- a/ceph-docker-flake8/config/definitions/ceph-docker-flake8.yml +++ b/ceph-container-flake8/config/definitions/ceph-container-flake8.yml @@ -1,8 +1,8 @@ - scm: - name: ceph-docker + name: ceph-container scm: - git: - url: https://github.com/ceph/ceph-docker.git + url: https://github.com/ceph/ceph-container.git branches: - ${sha1} refspec: +refs/pull/*:refs/remotes/origin/pr/* @@ -10,16 +10,16 @@ timeout: 20 skip-tag: true wipe-workspace: false - basedir: "ceph-docker" + basedir: "ceph-container" - job: - name: ceph-docker-flake8 + name: ceph-container-flake8 node: small && centos7 defaults: global - display-name: 'ceph-docker-flake8' + display-name: 'ceph-container-flake8' properties: - github: - url: https://github.com/ceph/ceph-docker/ + url: https://github.com/ceph/ceph-container/ logrotate: daysToKeep: 15 numToKeep: 30 @@ -51,7 +51,7 @@ failure-status: "FAIL - please clean up for merge" scm: - - ceph-docker + - ceph-container builders: - shell: diff --git a/ceph-docker-lint/build/build b/ceph-container-lint/build/build similarity index 91% rename from ceph-docker-lint/build/build rename to ceph-container-lint/build/build index 7aeae3b8..e2527838 100755 --- a/ceph-docker-lint/build/build +++ b/ceph-container-lint/build/build @@ -11,7 +11,7 @@ function generate_filelist(){ then find . -name '*.sh' | grep -vE "$IGNORE_THESE_FILES" else - curl -XGET "https://api.github.com/repos/ceph/ceph-docker/pulls/$pull_request_id/files" | + curl -XGET "https://api.github.com/repos/ceph/ceph-container/pulls/$pull_request_id/files" | jq '.[].filename' | # just the files please tr -d '"' | # remove the quoting from JSON grep ".sh$" | # just the bash @@ -51,7 +51,7 @@ function main() { fi - pushd "$workspace/ceph-docker" + pushd "$workspace/ceph-container" generate_filelist | check popd exit $? diff --git a/ceph-docker-lint/config/JENKINS_URL b/ceph-container-lint/config/JENKINS_URL similarity index 100% rename from ceph-docker-lint/config/JENKINS_URL rename to ceph-container-lint/config/JENKINS_URL diff --git a/ceph-docker-lint/config/definitions/ceph-docker-lint.yml b/ceph-container-lint/config/definitions/ceph-container-lint.yml similarity index 81% rename from ceph-docker-lint/config/definitions/ceph-docker-lint.yml rename to ceph-container-lint/config/definitions/ceph-container-lint.yml index 3b434303..e353027e 100644 --- a/ceph-docker-lint/config/definitions/ceph-docker-lint.yml +++ b/ceph-container-lint/config/definitions/ceph-container-lint.yml @@ -1,8 +1,8 @@ - scm: - name: ceph-docker + name: ceph-container scm: - git: - url: https://github.com/ceph/ceph-docker.git + url: https://github.com/ceph/ceph-container.git branches: - ${sha1} refspec: +refs/pull/*:refs/remotes/origin/pr/* @@ -10,16 +10,16 @@ timeout: 20 skip-tag: true wipe-workspace: false - basedir: "ceph-docker" + basedir: "ceph-container" - job: - name: ceph-docker-lint + name: ceph-container-lint node: small && centos7 defaults: global - display-name: 'ceph-docker-lint' + display-name: 'ceph-container-lint' properties: - github: - url: https://github.com/ceph/ceph-docker/ + url: https://github.com/ceph/ceph-container/ logrotate: daysToKeep: 15 numToKeep: 30 @@ -50,7 +50,7 @@ failure-status: "FAIL - please clean up for merge" scm: - - ceph-docker + - ceph-container builders: - shell: diff --git a/ceph-docker-nightly/build/build b/ceph-container-nighlity/build/build similarity index 100% rename from ceph-docker-nightly/build/build rename to ceph-container-nighlity/build/build diff --git a/ceph-docker-nightly/build/teardown b/ceph-container-nighlity/build/teardown similarity index 100% rename from ceph-docker-nightly/build/teardown rename to ceph-container-nighlity/build/teardown diff --git a/ceph-docker-nightly/config/JENKINS_URL b/ceph-container-nighlity/config/JENKINS_URL similarity index 100% rename from ceph-docker-nightly/config/JENKINS_URL rename to ceph-container-nighlity/config/JENKINS_URL diff --git a/ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml b/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml similarity index 73% rename from ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml rename to ceph-container-nighlity/config/definitions/ceph-container-nightly.yml index 26c51567..2dc47d5c 100644 --- a/ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml +++ b/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml @@ -1,5 +1,5 @@ - project: - name: ceph-docker-nightly + name: ceph-container-nightly os: - centos7 - xenial @@ -11,21 +11,21 @@ - bluestore_osds_container - filestore_osds_container jobs: - - 'ceph-docker-nightly-ceph_ansible-{ceph-version}-{os}-{test}' + - 'ceph-container-nightly-ceph_ansible-{ceph-version}-{os}-{test}' - job-template: - name: 'ceph-docker-nightly-ceph_ansible-{ceph-version}-{os}-{test}' + name: 'ceph-container-nightly-ceph_ansible-{ceph-version}-{os}-{test}' node: vagrant&&libvirt&¢os7 concurrent: true defaults: global - display-name: 'ceph-docker: Nightly tests [ceph_ansible-{ceph-version}-{os}-{test}]' + display-name: 'ceph-container: Nightly tests [ceph_ansible-{ceph-version}-{os}-{test}]' quiet-period: 5 block-downstream: false block-upstream: false retry-count: 3 properties: - github: - url: https://github.com/ceph/ceph-docker + url: https://github.com/ceph/ceph-container logrotate: daysToKeep: -1 numToKeep: -1 @@ -35,7 +35,7 @@ parameters: - string: name: BRANCH - description: "A ceph-docker branch to test" + description: "A ceph-container branch to test" default: master triggers: @@ -43,7 +43,7 @@ scm: - git: - url: https://github.com/ceph/ceph-docker.git + url: https://github.com/ceph/ceph-container.git branches: - ${{BRANCH}} browser: auto diff --git a/ceph-docker-prs/build/build b/ceph-container-prs/build/build similarity index 100% rename from ceph-docker-prs/build/build rename to ceph-container-prs/build/build diff --git a/ceph-docker-prs/build/teardown b/ceph-container-prs/build/teardown similarity index 100% rename from ceph-docker-prs/build/teardown rename to ceph-container-prs/build/teardown diff --git a/ceph-docker-prs/config/JENKINS_URL b/ceph-container-prs/config/JENKINS_URL similarity index 100% rename from ceph-docker-prs/config/JENKINS_URL rename to ceph-container-prs/config/JENKINS_URL diff --git a/ceph-docker-prs/config/definitions/ceph-docker-prs.yml b/ceph-container-prs/config/definitions/ceph-container-prs.yml similarity index 84% rename from ceph-docker-prs/config/definitions/ceph-docker-prs.yml rename to ceph-container-prs/config/definitions/ceph-container-prs.yml index 194016af..e06c0373 100644 --- a/ceph-docker-prs/config/definitions/ceph-docker-prs.yml +++ b/ceph-container-prs/config/definitions/ceph-container-prs.yml @@ -1,5 +1,5 @@ - project: - name: ceph-docker-prs + name: ceph-container-prs os: - centos7 - xenial @@ -12,22 +12,22 @@ - bluestore_osds_container - docker_cluster_collocation jobs: - - 'ceph-docker-prs-ceph_ansible-{ceph-version}-{os}-{test}' + - 'ceph-container-prs-ceph_ansible-{ceph-version}-{os}-{test}' - job-template: - name: 'ceph-docker-prs-ceph_ansible-{ceph-version}-{os}-{test}' + name: 'ceph-container-prs-ceph_ansible-{ceph-version}-{os}-{test}' node: vagrant&&libvirt&¢os7 concurrent: true defaults: global - display-name: 'ceph-docker: Pull Requests [ceph_ansible-{ceph-version}-{os}-{test}]' + display-name: 'ceph-container: Pull Requests [ceph_ansible-{ceph-version}-{os}-{test}]' quiet-period: 5 block-downstream: false block-upstream: false retry-count: 3 properties: - github: - url: https://github.com/ceph/ceph-docker + url: https://github.com/ceph/ceph-container logrotate: daysToKeep: 15 numToKeep: -1 @@ -57,7 +57,7 @@ scm: - git: - url: https://github.com/ceph/ceph-docker.git + url: https://github.com/ceph/ceph-container.git branches: - ${{sha1}} refspec: +refs/pull/*:refs/remotes/origin/pr/* -- 2.39.5