]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-container: update project name 905/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Mon, 6 Nov 2017 19:47:03 +0000 (20:47 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 6 Nov 2017 19:58:19 +0000 (20:58 +0100)
roject name has been changed from `ceph-docker` to `ceph-container`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
28 files changed:
ceph-container-flake8/build/build [new file with mode: 0755]
ceph-container-flake8/config/JENKINS_URL [new file with mode: 0644]
ceph-container-flake8/config/definitions/ceph-container-flake8.yml [new file with mode: 0644]
ceph-container-lint/build/build [new file with mode: 0755]
ceph-container-lint/config/JENKINS_URL [new file with mode: 0644]
ceph-container-lint/config/definitions/ceph-container-lint.yml [new file with mode: 0644]
ceph-container-nighlity/build/build [new file with mode: 0644]
ceph-container-nighlity/build/teardown [new file with mode: 0644]
ceph-container-nighlity/config/JENKINS_URL [new file with mode: 0644]
ceph-container-nighlity/config/definitions/ceph-container-nightly.yml [new file with mode: 0644]
ceph-container-prs/build/build [new file with mode: 0644]
ceph-container-prs/build/teardown [new file with mode: 0644]
ceph-container-prs/config/JENKINS_URL [new file with mode: 0644]
ceph-container-prs/config/definitions/ceph-container-prs.yml [new file with mode: 0644]
ceph-docker-flake8/build/build [deleted file]
ceph-docker-flake8/config/JENKINS_URL [deleted file]
ceph-docker-flake8/config/definitions/ceph-docker-flake8.yml [deleted file]
ceph-docker-lint/build/build [deleted file]
ceph-docker-lint/config/JENKINS_URL [deleted file]
ceph-docker-lint/config/definitions/ceph-docker-lint.yml [deleted file]
ceph-docker-nightly/build/build [deleted file]
ceph-docker-nightly/build/teardown [deleted file]
ceph-docker-nightly/config/JENKINS_URL [deleted file]
ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml [deleted file]
ceph-docker-prs/build/build [deleted file]
ceph-docker-prs/build/teardown [deleted file]
ceph-docker-prs/config/JENKINS_URL [deleted file]
ceph-docker-prs/config/definitions/ceph-docker-prs.yml [deleted file]

diff --git a/ceph-container-flake8/build/build b/ceph-container-flake8/build/build
new file mode 100755 (executable)
index 0000000..50991dd
--- /dev/null
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+set -e
+set -x
+
+function generate_filelist(){
+   if [[ "$pull_request_id" -eq "" || "${ghprbCommentBody:-}" = "jenkins flake8 all" ]]
+   then
+       find . -name '*.py'
+   else
+       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
+   fi
+
+}
+
+function check(){
+    local file
+    while read -r filename; do
+        pushd "$(dirname "$filename")"
+        file=$(basename "$filename")
+        sudo docker run --rm -v "$(pwd)"/"$file":/"$file" eeacms/flake8 /"$file"
+        popd
+    done
+    return $?
+}
+
+function main() {
+    # install some of our dependencies if running on a jenkins slave
+    if [[ -n "$HUDSON_URL" ]]
+    then
+        sudo yum -y install epel-release
+        sudo yum -y install docker jq
+        sudo systemctl start docker
+        pull_request_id=${ghprbPullId:-$2}
+        workspace=${WORKSPACE:-$1}
+    else
+        if ! command -v docker || ! command -v jq
+        then
+            echo "docker or jq is/are missing, install it/them"
+            exit 1
+        fi
+        pull_request_id=${ghprbPullId:-$2}
+        workspace=${WORKSPACE:-$1}
+    fi
+
+
+    pushd "$workspace/ceph-container"
+    generate_filelist | check
+    popd
+    exit $?
+}
+
+main "$@"
diff --git a/ceph-container-flake8/config/JENKINS_URL b/ceph-container-flake8/config/JENKINS_URL
new file mode 100644 (file)
index 0000000..e97cf67
--- /dev/null
@@ -0,0 +1 @@
+2.jenkins.ceph.com
diff --git a/ceph-container-flake8/config/definitions/ceph-container-flake8.yml b/ceph-container-flake8/config/definitions/ceph-container-flake8.yml
new file mode 100644 (file)
index 0000000..f9f1c62
--- /dev/null
@@ -0,0 +1,60 @@
+- scm:
+    name: ceph-container
+    scm:
+      - git:
+          url: https://github.com/ceph/ceph-container.git
+          branches:
+            - ${sha1}
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          browser: auto
+          timeout: 20
+          skip-tag: true
+          wipe-workspace: false
+          basedir: "ceph-container"
+
+- job:
+    name: ceph-container-flake8
+    node: small && centos7
+    defaults: global
+    display-name: 'ceph-container-flake8'
+    properties:
+      - github:
+          url: https://github.com/ceph/ceph-container/
+    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:
+          admin-list:
+            - alfredodeza
+            - ktdreyer
+            - gmeno
+            - zcerza
+          org-list:
+            - ceph
+          trigger-phrase: 'jenkins flake8'
+          only-trigger-phrase: false
+          github-hooks: true
+          permit-all: true
+          auto-close-on-fail: false
+          status-context: "Testing: for sloppy python"
+          started-status: "Running: flake8"
+          success-status: "OK - nice work"
+          failure-status: "FAIL - please clean up for merge"
+
+    scm:
+      - ceph-container
+
+    builders:
+      - shell:
+          !include-raw:
+            - ../../build/build
+
diff --git a/ceph-container-lint/build/build b/ceph-container-lint/build/build
new file mode 100755 (executable)
index 0000000..e252783
--- /dev/null
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+set -e
+set -x
+
+IGNORE_THESE_CODES="SC1091,SC2009,SC2001"
+IGNORE_THESE_FILES="variables_entrypoint.sh" # pipe-separated file names, e.g: foo|bar|foobar, this avoids shellcheck complaining that vars are not used (see: SC2034)
+
+function generate_filelist(){
+   if [[ "$pull_request_id" -eq "" || "${ghprbCommentBody:-}" = "jenkins lint all" ]]
+   then
+       find . -name '*.sh' | grep -vE "$IGNORE_THESE_FILES"
+   else
+       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
+       grep -vE "$IGNORE_THESE_FILES"
+   fi
+
+}
+
+function check(){
+    local file
+    while read -r filename; do
+        pushd "$(dirname "$filename")"
+        file=$(basename "$filename")
+        sudo docker run -v "$(pwd)"/"$file":/"$file" koalaman/shellcheck --external-sources --exclude "$IGNORE_THESE_CODES" /"$file"
+        popd
+    done
+    return $?
+}
+
+function main() {
+    # install some of our dependencies if running on a jenkins slave
+    if [[ -n "$HUDSON_URL" ]]
+    then
+        sudo yum -y install epel-release
+        sudo yum -y install docker jq
+        sudo systemctl start docker
+        pull_request_id=${ghprbPullId:-$2}
+        workspace=${WORKSPACE:-$1}
+    else
+        if ! command -v docker || ! command -v jq
+        then
+            echo "docker or jq is/are missing, install it/them"
+            exit 1
+        fi
+        pull_request_id=${ghprbPullId:-$2}
+        workspace=${WORKSPACE:-$1}
+    fi
+
+
+    pushd "$workspace/ceph-container"
+    generate_filelist | check
+    popd
+    exit $?
+}
+
+main "$@"
diff --git a/ceph-container-lint/config/JENKINS_URL b/ceph-container-lint/config/JENKINS_URL
new file mode 100644 (file)
index 0000000..e97cf67
--- /dev/null
@@ -0,0 +1 @@
+2.jenkins.ceph.com
diff --git a/ceph-container-lint/config/definitions/ceph-container-lint.yml b/ceph-container-lint/config/definitions/ceph-container-lint.yml
new file mode 100644 (file)
index 0000000..e353027
--- /dev/null
@@ -0,0 +1,59 @@
+- scm:
+    name: ceph-container
+    scm:
+      - git:
+          url: https://github.com/ceph/ceph-container.git
+          branches:
+            - ${sha1}
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          browser: auto
+          timeout: 20
+          skip-tag: true
+          wipe-workspace: false
+          basedir: "ceph-container"
+
+- job:
+    name: ceph-container-lint
+    node: small && centos7
+    defaults: global
+    display-name: 'ceph-container-lint'
+    properties:
+      - github:
+          url: https://github.com/ceph/ceph-container/
+    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:
+          admin-list:
+            - alfredodeza
+            - ktdreyer
+            - gmeno
+          org-list:
+            - ceph
+          trigger-phrase: 'jenkins lint'
+          only-trigger-phrase: false
+          github-hooks: true
+          permit-all: true
+          auto-close-on-fail: false
+          status-context: "Testing: for sloppy bash"
+          started-status: "Running: shellchecker"
+          success-status: "OK - nice work"
+          failure-status: "FAIL - please clean up for merge"
+
+    scm:
+      - ceph-container
+
+    builders:
+      - shell:
+          !include-raw:
+            - ../../build/build
+
diff --git a/ceph-container-nighlity/build/build b/ceph-container-nighlity/build/build
new file mode 100644 (file)
index 0000000..589d3fc
--- /dev/null
@@ -0,0 +1,20 @@
+#!/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
+
+WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
+
+delete_libvirt_vms
+clear_libvirt_networks
+restart_libvirt_services
+update_vagrant_boxes
+
+if ! timeout 3h $VENV/tox -rv -e=$SCENARIO --workdir=$WORKDIR; then
+  echo "ERROR: Job didn't complete successfully or got stuck for more than 3h."
+  exit 1
+fi
diff --git a/ceph-container-nighlity/build/teardown b/ceph-container-nighlity/build/teardown
new file mode 100644 (file)
index 0000000..5790664
--- /dev/null
@@ -0,0 +1,13 @@
+#!/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/ceph-ansible/tests/functional
+
+scenarios=$(find . | grep Vagrantfile | xargs dirname)
+
+for scenario in $scenarios; do
+    cd $scenario
+    vagrant destroy -f
+    cd -
+done
diff --git a/ceph-container-nighlity/config/JENKINS_URL b/ceph-container-nighlity/config/JENKINS_URL
new file mode 100644 (file)
index 0000000..e97cf67
--- /dev/null
@@ -0,0 +1 @@
+2.jenkins.ceph.com
diff --git a/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml b/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml
new file mode 100644 (file)
index 0000000..2dc47d5
--- /dev/null
@@ -0,0 +1,66 @@
+- project:
+    name: ceph-container-nightly
+    os:
+      - centos7
+      - xenial
+    ceph-version:
+      - jewel
+      - luminous
+    test:
+      - cluster
+      - bluestore_osds_container
+      - filestore_osds_container
+    jobs:
+        - 'ceph-container-nightly-ceph_ansible-{ceph-version}-{os}-{test}'
+
+- job-template:
+    name: 'ceph-container-nightly-ceph_ansible-{ceph-version}-{os}-{test}'
+    node: vagrant&&libvirt&&centos7
+    concurrent: true
+    defaults: global
+    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-container
+    logrotate:
+      daysToKeep: -1
+      numToKeep: -1
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
+
+    parameters:
+      - string:
+          name: BRANCH
+          description: "A ceph-container branch to test"
+          default: master
+
+    triggers:
+      - timed: '@daily'
+
+    scm:
+      - git:
+          url: https://github.com/ceph/ceph-container.git
+          branches:
+            - ${{BRANCH}}
+          browser: auto
+          timeout: 20
+
+    builders:
+      - inject:
+          properties-content: |
+            SCENARIO=ceph_ansible-{ceph-version}-{os}-{test}
+      - shell:
+          !include-raw-escape:
+            - ../../../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-container-prs/build/build b/ceph-container-prs/build/build
new file mode 100644 (file)
index 0000000..589d3fc
--- /dev/null
@@ -0,0 +1,20 @@
+#!/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
+
+WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
+
+delete_libvirt_vms
+clear_libvirt_networks
+restart_libvirt_services
+update_vagrant_boxes
+
+if ! timeout 3h $VENV/tox -rv -e=$SCENARIO --workdir=$WORKDIR; then
+  echo "ERROR: Job didn't complete successfully or got stuck for more than 3h."
+  exit 1
+fi
diff --git a/ceph-container-prs/build/teardown b/ceph-container-prs/build/teardown
new file mode 100644 (file)
index 0000000..5790664
--- /dev/null
@@ -0,0 +1,13 @@
+#!/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/ceph-ansible/tests/functional
+
+scenarios=$(find . | grep Vagrantfile | xargs dirname)
+
+for scenario in $scenarios; do
+    cd $scenario
+    vagrant destroy -f
+    cd -
+done
diff --git a/ceph-container-prs/config/JENKINS_URL b/ceph-container-prs/config/JENKINS_URL
new file mode 100644 (file)
index 0000000..e97cf67
--- /dev/null
@@ -0,0 +1 @@
+2.jenkins.ceph.com
diff --git a/ceph-container-prs/config/definitions/ceph-container-prs.yml b/ceph-container-prs/config/definitions/ceph-container-prs.yml
new file mode 100644 (file)
index 0000000..e06c037
--- /dev/null
@@ -0,0 +1,83 @@
+- project:
+    name: ceph-container-prs
+    os:
+      - centos7
+      - xenial
+    ceph-version:
+      - jewel
+      - luminous
+    test:
+      - cluster
+      - filestore_osds_container
+      - bluestore_osds_container
+      - docker_cluster_collocation
+    jobs:
+        - 'ceph-container-prs-ceph_ansible-{ceph-version}-{os}-{test}'
+
+
+- job-template:
+    name: 'ceph-container-prs-ceph_ansible-{ceph-version}-{os}-{test}'
+    node: vagrant&&libvirt&&centos7
+    concurrent: true
+    defaults: global
+    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-container
+    logrotate:
+      daysToKeep: 15
+      numToKeep: -1
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
+
+    parameters:
+      - string:
+          name: sha1
+          description: "A pull request ID, like 'origin/pr/72/head'"
+
+    triggers:
+      - github-pull-request:
+          cancel-builds-on-update: true
+          allow-whitelist-orgs-as-admins: true
+          org-list:
+            - ceph
+          trigger-phrase: 'jenkins test ceph_ansible-{ceph-version}-{os}-{test}'
+          only-trigger-phrase: false
+          github-hooks: true
+          permit-all: true
+          auto-close-on-fail: false
+          status-context: "Testing: ceph_ansible-{ceph-version}-{os}-{test}"
+          started-status: "Running: ceph_ansible-{ceph-version}-{os}-{test}"
+          success-status: "OK - ceph_ansible-{ceph-version}-{os}-{test}"
+          failure-status: "FAIL - ceph_ansible-{ceph-version}-{os}-{test}"
+
+    scm:
+      - git:
+          url: https://github.com/ceph/ceph-container.git
+          branches:
+            - ${{sha1}}
+          refspec: +refs/pull/*:refs/remotes/origin/pr/*
+          browser: auto
+          timeout: 20
+          skip-tag: true
+          wipe-workspace: false
+
+    builders:
+      - inject:
+          properties-content: |
+            SCENARIO=ceph_ansible-{ceph-version}-{os}-{test}
+      - shell:
+          !include-raw-escape:
+            - ../../../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-docker-flake8/build/build b/ceph-docker-flake8/build/build
deleted file mode 100755 (executable)
index e2682ef..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-function generate_filelist(){
-   if [[ "$pull_request_id" -eq "" || "${ghprbCommentBody:-}" = "jenkins flake8 all" ]]
-   then
-       find . -name '*.py'
-   else
-       curl -XGET "https://api.github.com/repos/ceph/ceph-docker/pulls/$pull_request_id/files" |
-       jq '.[].filename' |  # just the files please
-       tr -d '"' |  # remove the quoting from JSON
-       grep ".py$" # just the python
-   fi
-
-}
-
-function check(){
-    local file
-    while read -r filename; do
-        pushd "$(dirname "$filename")"
-        file=$(basename "$filename")
-        sudo docker run --rm -v "$(pwd)"/"$file":/"$file" eeacms/flake8 /"$file"
-        popd
-    done
-    return $?
-}
-
-function main() {
-    # install some of our dependencies if running on a jenkins slave
-    if [[ -n "$HUDSON_URL" ]]
-    then
-        sudo yum -y install epel-release
-        sudo yum -y install docker jq
-        sudo systemctl start docker
-        pull_request_id=${ghprbPullId:-$2}
-        workspace=${WORKSPACE:-$1}
-    else
-        if ! command -v docker || ! command -v jq
-        then
-            echo "docker or jq is/are missing, install it/them"
-            exit 1
-        fi
-        pull_request_id=${ghprbPullId:-$2}
-        workspace=${WORKSPACE:-$1}
-    fi
-
-
-    pushd "$workspace/ceph-docker"
-    generate_filelist | check
-    popd
-    exit $?
-}
-
-main "$@"
diff --git a/ceph-docker-flake8/config/JENKINS_URL b/ceph-docker-flake8/config/JENKINS_URL
deleted file mode 100644 (file)
index e97cf67..0000000
+++ /dev/null
@@ -1 +0,0 @@
-2.jenkins.ceph.com
diff --git a/ceph-docker-flake8/config/definitions/ceph-docker-flake8.yml b/ceph-docker-flake8/config/definitions/ceph-docker-flake8.yml
deleted file mode 100644 (file)
index 7f0d29d..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-- scm:
-    name: ceph-docker
-    scm:
-      - git:
-          url: https://github.com/ceph/ceph-docker.git
-          branches:
-            - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
-          browser: auto
-          timeout: 20
-          skip-tag: true
-          wipe-workspace: false
-          basedir: "ceph-docker"
-
-- job:
-    name: ceph-docker-flake8
-    node: small && centos7
-    defaults: global
-    display-name: 'ceph-docker-flake8'
-    properties:
-      - github:
-          url: https://github.com/ceph/ceph-docker/
-    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:
-          admin-list:
-            - alfredodeza
-            - ktdreyer
-            - gmeno
-            - zcerza
-          org-list:
-            - ceph
-          trigger-phrase: 'jenkins flake8'
-          only-trigger-phrase: false
-          github-hooks: true
-          permit-all: true
-          auto-close-on-fail: false
-          status-context: "Testing: for sloppy python"
-          started-status: "Running: flake8"
-          success-status: "OK - nice work"
-          failure-status: "FAIL - please clean up for merge"
-
-    scm:
-      - ceph-docker
-
-    builders:
-      - shell:
-          !include-raw:
-            - ../../build/build
-
diff --git a/ceph-docker-lint/build/build b/ceph-docker-lint/build/build
deleted file mode 100755 (executable)
index 7aeae3b..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-IGNORE_THESE_CODES="SC1091,SC2009,SC2001"
-IGNORE_THESE_FILES="variables_entrypoint.sh" # pipe-separated file names, e.g: foo|bar|foobar, this avoids shellcheck complaining that vars are not used (see: SC2034)
-
-function generate_filelist(){
-   if [[ "$pull_request_id" -eq "" || "${ghprbCommentBody:-}" = "jenkins lint all" ]]
-   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" |
-       jq '.[].filename' |  # just the files please
-       tr -d '"' |  # remove the quoting from JSON
-       grep ".sh$" | # just the bash
-       grep -vE "$IGNORE_THESE_FILES"
-   fi
-
-}
-
-function check(){
-    local file
-    while read -r filename; do
-        pushd "$(dirname "$filename")"
-        file=$(basename "$filename")
-        sudo docker run -v "$(pwd)"/"$file":/"$file" koalaman/shellcheck --external-sources --exclude "$IGNORE_THESE_CODES" /"$file"
-        popd
-    done
-    return $?
-}
-
-function main() {
-    # install some of our dependencies if running on a jenkins slave
-    if [[ -n "$HUDSON_URL" ]]
-    then
-        sudo yum -y install epel-release
-        sudo yum -y install docker jq
-        sudo systemctl start docker
-        pull_request_id=${ghprbPullId:-$2}
-        workspace=${WORKSPACE:-$1}
-    else
-        if ! command -v docker || ! command -v jq
-        then
-            echo "docker or jq is/are missing, install it/them"
-            exit 1
-        fi
-        pull_request_id=${ghprbPullId:-$2}
-        workspace=${WORKSPACE:-$1}
-    fi
-
-
-    pushd "$workspace/ceph-docker"
-    generate_filelist | check
-    popd
-    exit $?
-}
-
-main "$@"
diff --git a/ceph-docker-lint/config/JENKINS_URL b/ceph-docker-lint/config/JENKINS_URL
deleted file mode 100644 (file)
index e97cf67..0000000
+++ /dev/null
@@ -1 +0,0 @@
-2.jenkins.ceph.com
diff --git a/ceph-docker-lint/config/definitions/ceph-docker-lint.yml b/ceph-docker-lint/config/definitions/ceph-docker-lint.yml
deleted file mode 100644 (file)
index 3b43430..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-- scm:
-    name: ceph-docker
-    scm:
-      - git:
-          url: https://github.com/ceph/ceph-docker.git
-          branches:
-            - ${sha1}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
-          browser: auto
-          timeout: 20
-          skip-tag: true
-          wipe-workspace: false
-          basedir: "ceph-docker"
-
-- job:
-    name: ceph-docker-lint
-    node: small && centos7
-    defaults: global
-    display-name: 'ceph-docker-lint'
-    properties:
-      - github:
-          url: https://github.com/ceph/ceph-docker/
-    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:
-          admin-list:
-            - alfredodeza
-            - ktdreyer
-            - gmeno
-          org-list:
-            - ceph
-          trigger-phrase: 'jenkins lint'
-          only-trigger-phrase: false
-          github-hooks: true
-          permit-all: true
-          auto-close-on-fail: false
-          status-context: "Testing: for sloppy bash"
-          started-status: "Running: shellchecker"
-          success-status: "OK - nice work"
-          failure-status: "FAIL - please clean up for merge"
-
-    scm:
-      - ceph-docker
-
-    builders:
-      - shell:
-          !include-raw:
-            - ../../build/build
-
diff --git a/ceph-docker-nightly/build/build b/ceph-docker-nightly/build/build
deleted file mode 100644 (file)
index 589d3fc..0000000
+++ /dev/null
@@ -1,20 +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
-
-WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
-
-delete_libvirt_vms
-clear_libvirt_networks
-restart_libvirt_services
-update_vagrant_boxes
-
-if ! timeout 3h $VENV/tox -rv -e=$SCENARIO --workdir=$WORKDIR; then
-  echo "ERROR: Job didn't complete successfully or got stuck for more than 3h."
-  exit 1
-fi
diff --git a/ceph-docker-nightly/build/teardown b/ceph-docker-nightly/build/teardown
deleted file mode 100644 (file)
index 5790664..0000000
+++ /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/ceph-ansible/tests/functional
-
-scenarios=$(find . | grep Vagrantfile | xargs dirname)
-
-for scenario in $scenarios; do
-    cd $scenario
-    vagrant destroy -f
-    cd -
-done
diff --git a/ceph-docker-nightly/config/JENKINS_URL b/ceph-docker-nightly/config/JENKINS_URL
deleted file mode 100644 (file)
index e97cf67..0000000
+++ /dev/null
@@ -1 +0,0 @@
-2.jenkins.ceph.com
diff --git a/ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml b/ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml
deleted file mode 100644 (file)
index 26c5156..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-- project:
-    name: ceph-docker-nightly
-    os:
-      - centos7
-      - xenial
-    ceph-version:
-      - jewel
-      - luminous
-    test:
-      - cluster
-      - bluestore_osds_container
-      - filestore_osds_container
-    jobs:
-        - 'ceph-docker-nightly-ceph_ansible-{ceph-version}-{os}-{test}'
-
-- job-template:
-    name: 'ceph-docker-nightly-ceph_ansible-{ceph-version}-{os}-{test}'
-    node: vagrant&&libvirt&&centos7
-    concurrent: true
-    defaults: global
-    display-name: 'ceph-docker: 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
-    logrotate:
-      daysToKeep: -1
-      numToKeep: -1
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-
-    parameters:
-      - string:
-          name: BRANCH
-          description: "A ceph-docker branch to test"
-          default: master
-
-    triggers:
-      - timed: '@daily'
-
-    scm:
-      - git:
-          url: https://github.com/ceph/ceph-docker.git
-          branches:
-            - ${{BRANCH}}
-          browser: auto
-          timeout: 20
-
-    builders:
-      - inject:
-          properties-content: |
-            SCENARIO=ceph_ansible-{ceph-version}-{os}-{test}
-      - shell:
-          !include-raw-escape:
-            - ../../../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-docker-prs/build/build b/ceph-docker-prs/build/build
deleted file mode 100644 (file)
index 589d3fc..0000000
+++ /dev/null
@@ -1,20 +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
-
-WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
-
-delete_libvirt_vms
-clear_libvirt_networks
-restart_libvirt_services
-update_vagrant_boxes
-
-if ! timeout 3h $VENV/tox -rv -e=$SCENARIO --workdir=$WORKDIR; then
-  echo "ERROR: Job didn't complete successfully or got stuck for more than 3h."
-  exit 1
-fi
diff --git a/ceph-docker-prs/build/teardown b/ceph-docker-prs/build/teardown
deleted file mode 100644 (file)
index 5790664..0000000
+++ /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/ceph-ansible/tests/functional
-
-scenarios=$(find . | grep Vagrantfile | xargs dirname)
-
-for scenario in $scenarios; do
-    cd $scenario
-    vagrant destroy -f
-    cd -
-done
diff --git a/ceph-docker-prs/config/JENKINS_URL b/ceph-docker-prs/config/JENKINS_URL
deleted file mode 100644 (file)
index e97cf67..0000000
+++ /dev/null
@@ -1 +0,0 @@
-2.jenkins.ceph.com
diff --git a/ceph-docker-prs/config/definitions/ceph-docker-prs.yml b/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
deleted file mode 100644 (file)
index 194016a..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-- project:
-    name: ceph-docker-prs
-    os:
-      - centos7
-      - xenial
-    ceph-version:
-      - jewel
-      - luminous
-    test:
-      - cluster
-      - filestore_osds_container
-      - bluestore_osds_container
-      - docker_cluster_collocation
-    jobs:
-        - 'ceph-docker-prs-ceph_ansible-{ceph-version}-{os}-{test}'
-
-
-- job-template:
-    name: 'ceph-docker-prs-ceph_ansible-{ceph-version}-{os}-{test}'
-    node: vagrant&&libvirt&&centos7
-    concurrent: true
-    defaults: global
-    display-name: 'ceph-docker: 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
-    logrotate:
-      daysToKeep: 15
-      numToKeep: -1
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-
-    parameters:
-      - string:
-          name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
-
-    triggers:
-      - github-pull-request:
-          cancel-builds-on-update: true
-          allow-whitelist-orgs-as-admins: true
-          org-list:
-            - ceph
-          trigger-phrase: 'jenkins test ceph_ansible-{ceph-version}-{os}-{test}'
-          only-trigger-phrase: false
-          github-hooks: true
-          permit-all: true
-          auto-close-on-fail: false
-          status-context: "Testing: ceph_ansible-{ceph-version}-{os}-{test}"
-          started-status: "Running: ceph_ansible-{ceph-version}-{os}-{test}"
-          success-status: "OK - ceph_ansible-{ceph-version}-{os}-{test}"
-          failure-status: "FAIL - ceph_ansible-{ceph-version}-{os}-{test}"
-
-    scm:
-      - git:
-          url: https://github.com/ceph/ceph-docker.git
-          branches:
-            - ${{sha1}}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
-          browser: auto
-          timeout: 20
-          skip-tag: true
-          wipe-workspace: false
-
-    builders:
-      - inject:
-          properties-content: |
-            SCENARIO=ceph_ansible-{ceph-version}-{os}-{test}
-      - shell:
-          !include-raw-escape:
-            - ../../../scripts/build_utils.sh
-            - ../../build/build
-
-    publishers:
-      - postbuildscript:
-          script-only-if-succeeded: False
-          script-only-if-failed: True
-          builders:
-            - shell: !include-raw ../../build/teardown