From b6884a399269a5e5856dab79f1b977447917b983 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 24 Jan 2017 16:12:49 -0600 Subject: [PATCH] remove the ceph-docker-pull-requests job This has been replace with ceph-docker-prs Signed-off-by: Andrew Schoen --- ceph-docker-pull-requests/build/build | 45 ------------ ceph-docker-pull-requests/build/failure | 23 ------ ceph-docker-pull-requests/build/teardown | 6 -- .../definitions/ceph-docker-pull-requests.yml | 70 ------------------- 4 files changed, 144 deletions(-) delete mode 100644 ceph-docker-pull-requests/build/build delete mode 100644 ceph-docker-pull-requests/build/failure delete mode 100644 ceph-docker-pull-requests/build/teardown delete mode 100644 ceph-docker-pull-requests/config/definitions/ceph-docker-pull-requests.yml diff --git a/ceph-docker-pull-requests/build/build b/ceph-docker-pull-requests/build/build deleted file mode 100644 index 02a2b9de..00000000 --- a/ceph-docker-pull-requests/build/build +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -set -ex - -sudo apt-get install -y --force-yes docker.io -docker --version - -# build scripts in project use this directory as reference -cd "$WORKSPACE"/ceph-docker - -# pull requests tests should never have these directories here, but branches -# do, so for the build scripts to work correctly, these neeed to be removed -# XXX It requires sudo because these will appear with `root` ownership -sudo rm -rf "$WORKSPACE"/ceph-docker/{daemon,demo,base} - -sudo apt-get install -y --force-yes xfsprogs -sudo "$WORKSPACE"/ceph-docker/travis-builds/purge_cluster.sh -# XXX purge_cluster only stops containers, it doesn't really remove them so try to -# remove them for real -containers_to_remove=$(sudo docker ps -a -q) - -if [ "${containers_to_remove}" ]; then - sudo docker rm -f $@ ${containers_to_remove} || echo failed to remove containers -fi - - -sudo "$WORKSPACE"/ceph-docker/travis-builds/build_imgs.sh - -# NOTE(leseb): somehow putting everything in a 'script' task does not work -# so we have to split it up that way. -# It seems that we have an issue when not running 'docker run' from an install step -#install: -sudo "$WORKSPACE"/ceph-docker/travis-builds/prepare_osd_fs.sh -sudo docker run -d --name ceph-mon --net=host -v /etc/ceph:/etc/ceph -v /var/lib/ceph:/var/lib/ceph -e MON_IP=$(ip -4 -o a | awk '/eth|ens|eno|enp/ { sub ("/..", "", $4); print $4 }') -e CEPH_PUBLIC_NETWORK=$(grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}/[0-9]\{1,2\}' /proc/net/fib_trie | grep -vE "^127|0$" | head -1) daemon mon -sudo "$WORKSPACE"/ceph-docker/travis-builds/bootstrap_osd.sh -sudo docker run -d --name ceph-osd --net=host -v /etc/ceph:/etc/ceph -v /var/lib/ceph:/var/lib/ceph daemon osd_directory_single -sudo docker run -d --name ceph-mds --net=host -v /etc/ceph:/etc/ceph -v /var/lib/ceph:/var/lib/ceph -e CEPHFS_CREATE=1 daemon mds -sudo docker run -d --name ceph-rgw --net=host -v /etc/ceph:/etc/ceph -v /var/lib/ceph:/var/lib/ceph daemon rgw - -#script: -sudo "$WORKSPACE"/ceph-docker/travis-builds/validate_cluster.sh -sudo "$WORKSPACE"/ceph-docker/travis-builds/purge_cluster.sh -sudo "$WORKSPACE"/ceph-docker/travis-builds/prepare_osd_fs.sh -sudo docker run -d --name ceph-demo --net=host -v /etc/ceph:/etc/ceph -v /var/lib/ceph:/var/lib/ceph -e MON_IP=$(ip -4 -o a | awk '/eth|ens|eno|enp/ { sub ("/..", "", $4); print $4 }') -e CEPH_PUBLIC_NETWORK=$(grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}/[0-9]\{1,2\}' /proc/net/fib_trie | grep -vE "^127|0$" | head -1) demo -sudo "$WORKSPACE"/ceph-docker/travis-builds/validate_demo_cluster.sh diff --git a/ceph-docker-pull-requests/build/failure b/ceph-docker-pull-requests/build/failure deleted file mode 100644 index 61e966f5..00000000 --- a/ceph-docker-pull-requests/build/failure +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -set -x - -# The below calls can be so verbose that using a header will make it -# easier to track the actual failure point -printf '=%.0s' {1..100} -echo "ON FAILURE BUILD STEP" -printf '=%.0s' {1..100} - -# on failure: -sudo docker images -sudo docker ps -sudo docker ps -a -sudo docker logs ceph-mon -sudo docker logs ceph-osd -sudo docker logs ceph-mds -sudo docker logs ceph-rgw -sudo docker logs ceph-demo -sudo docker exec ceph-mon ceph -s -sudo docker exec ceph-demo ceph -s - - diff --git a/ceph-docker-pull-requests/build/teardown b/ceph-docker-pull-requests/build/teardown deleted file mode 100644 index 3e4859dc..00000000 --- a/ceph-docker-pull-requests/build/teardown +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -ex - -# This will stop all running containers -sudo "$WORKSPACE"/ceph-docker/travis-builds/purge_cluster.sh diff --git a/ceph-docker-pull-requests/config/definitions/ceph-docker-pull-requests.yml b/ceph-docker-pull-requests/config/definitions/ceph-docker-pull-requests.yml deleted file mode 100644 index 330a0504..00000000 --- a/ceph-docker-pull-requests/config/definitions/ceph-docker-pull-requests.yml +++ /dev/null @@ -1,70 +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-pull-requests - node: xenial&&huge&&amd64 - project-type: freestyle - defaults: global - display-name: 'ceph-docker: Pull Requests' - concurrent: true - 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: 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: '' - only-trigger-phrase: false - github-hooks: true - permit-all: true - auto-close-on-fail: false - status-context: "docker image" - started-status: "creating docker image(s)" - success-status: "OK - image(s) created" - failure-status: "docker image failed with errors" - - scm: - - ceph-docker - - builders: - - shell: - !include-raw: - - ../../../scripts/build_utils.sh - - ../../build/build - - ../../build/teardown - - publishers: - - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True - builders: - - shell: !include-raw ../../build/failure -- 2.39.5