]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
cleanup stale calamari* projects 534/head
authorgmeno <gmeno@localhost.localdomain>
Wed, 2 Nov 2016 17:12:34 +0000 (10:12 -0700)
committergmeno <gmeno@localhost.localdomain>
Wed, 2 Nov 2016 17:12:34 +0000 (10:12 -0700)
Signed-off-by: gmeno <gmeno@localhost.localdomain>
32 files changed:
calamari-clients-centos/build/build [deleted file]
calamari-clients-centos/config/definitions/calamari-clients-centos.yml [deleted file]
calamari-clients-precise-vagrant/build/build [deleted file]
calamari-clients-precise-vagrant/config/definitions/calamari-clients-precise-vagrant.yml [deleted file]
calamari-clients-precise/build/build [deleted file]
calamari-clients-precise/config/definitions/calamari-clients-precise.yml [deleted file]
calamari-clients-rhel/build/build [deleted file]
calamari-clients-rhel/config/definitions/calamari-clients-rhel.yml [deleted file]
calamari-clients-rhel7/build/build [deleted file]
calamari-clients-rhel7/config/definitions/calamari-clients-rhel7.yml [deleted file]
calamari-clients-trusty/build/build [deleted file]
calamari-clients-trusty/config/definitions/calamari-clients-trusty.yml [deleted file]
calamari-clients-vagrant/build/build [deleted file]
calamari-clients-vagrant/config/definitions/calamari-clients-vagrant.yml [deleted file]
calamari-clients-wheezy/build/build [deleted file]
calamari-clients-wheezy/config/definitions/calamari-clients-wheezy.yml [deleted file]
calamari-server-centos/build/build [deleted file]
calamari-server-centos/config/definitions/calamari-server-centos.yml [deleted file]
calamari-server-precise/build/build [deleted file]
calamari-server-precise/config/definitions/calamari-server-precise.yml [deleted file]
calamari-server-rhel/build/build [deleted file]
calamari-server-rhel/config/definitions/calamari-server-rhel.yml [deleted file]
calamari-server-rhel7/build/build [deleted file]
calamari-server-rhel7/config/definitions/calamari-server-rhel7.yml [deleted file]
calamari-server-trusty/build/build [deleted file]
calamari-server-trusty/config/definitions/calamari-server-trusty.yml [deleted file]
calamari-server-vagrant/build/build [deleted file]
calamari-server-vagrant/config/definitions/calamari-server-vagrant.yml [deleted file]
calamari-server-wheezy/build/build [deleted file]
calamari-server-wheezy/config/definitions/calamari-server-wheezy.yml [deleted file]
calamari-server/build/build [deleted file]
calamari-server/config/definitions/calamari-server.yml [deleted file]

diff --git a/calamari-clients-centos/build/build b/calamari-clients-centos/build/build
deleted file mode 100644 (file)
index 866612d..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-set -e
-
-test -e ${WORKSPACE}/calamari-clients-build-output.tar.gz || ( echo "no build-output
-tarball"; exit 1 )
-
-rm -f ${WORKSPACE}/calamari-clients*rpm
-
-cd ${WORKSPACE}/calamari-clients/vagrant/centos-package && vagrant destroy
--f && vagrant up
-
-vagrant ssh -c 'sudo salt-call --local state.highstate' | multitee 0-1,4
-4>/tmp/${BUILD_TAG}.out
-
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p'
-< /tmp/${BUILD_TAG}.out)
-
-rm /tmp/${BUILD_TAG}.out
-
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit
-1; fi
-
-vagrant destroy -f
-
-cd $WORKSPACE
-
-rm -rf $BRANCH
-
-mkdir $BRANCH
-
-mv *rpm $BRANCH
diff --git a/calamari-clients-centos/config/definitions/calamari-clients-centos.yml b/calamari-clients-centos/config/definitions/calamari-clients-centos.yml
deleted file mode 100644 (file)
index c53d334..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-- job:
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - copyartifact:
-        filter: $BRANCH/calamari-clients-build-output.tar.gz
-        flatten: true
-        project: calamari-clients-precise-vagrant
-        target: ${WORKSPACE}
-        which-build: last-successful
-    - shell: !include-raw ../../build/build
-    description: ''
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '-1'
-    name: 'calamari-clients-centos'
-    node: vagrant
-    parameters:
-    - string:
-        default: ''
-        description: ''
-        name: BRANCH
-    project-type: freestyle
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/calamari-clients*rpm
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - fingerprint:
-        files: $BRANCH/calamari-clients*rpm
-        record-artifacts: false
-    scm:
-    - git:
-        basedir: calamari-clients
-        branches:
-          - '*/${BRANCH}'
-        url: https://github.com/ceph/calamari-clients.git
diff --git a/calamari-clients-precise-vagrant/build/build b/calamari-clients-precise-vagrant/build/build
deleted file mode 100644 (file)
index 68865ba..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-set -e
-rm -f ${WORKSPACE}/calamari-clients*deb
-rm -f ${WORKSPACE}/calamari-clients-build-output.tar.gz
-cd ${WORKSPACE}/calamari-clients/vagrant/precise-build
-vagrant destroy -f && vagrant up 
-vagrant ssh -c 'sudo salt-call --local state.highstate' | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
-vagrant destroy -f
-cd $WORKSPACE
-rm -rf $BRANCH
-mkdir $BRANCH
-mv *deb $BRANCH
-mv calamari-clients-build-output.tar.gz $BRANCH
diff --git a/calamari-clients-precise-vagrant/config/definitions/calamari-clients-precise-vagrant.yml b/calamari-clients-precise-vagrant/config/definitions/calamari-clients-precise-vagrant.yml
deleted file mode 100644 (file)
index 1caafd1..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-- job:
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - shell: !include-raw ../../build/build
-    description: ''
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '10'
-    name: 'calamari-clients-precise-vagrant'
-    node: vagrant
-    parameters:
-    - string:
-        default: ''
-        description: ''
-        name: BRANCH
-    project-type: freestyle
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/calamari-clients*deb, $BRANCH/calamari-clients-build-output.tar.gz
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - fingerprint:
-        files: $BRANCH/calamari-clients*deb, $BRANCH/calamari-clients-build-output.tar.gz
-    scm:
-    - git:
-        basedir: calamari-clients
-        branches:
-          - '*/${BRANCH}'
-        url: https://github.com/ceph/calamari-clients.git
diff --git a/calamari-clients-precise/build/build b/calamari-clients-precise/build/build
deleted file mode 100644 (file)
index b414aaf..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-set -e
-rm -f ${WORKSPACE}/calamari-clients*deb
-rm -f ${WORKSPACE}/calamari-clients-build-output.tar.gz
-cd $WORKSPACE
-sudo -E salt-call --local --file-root $WORKSPACE/calamari-clients/vagrant/salt/roots -l debug state.highstate
-rm -rf $BRANCH
-mkdir $BRANCH
-mv *deb $BRANCH
-mv calamari-clients-build-output.tar.gz $BRANCH
diff --git a/calamari-clients-precise/config/definitions/calamari-clients-precise.yml b/calamari-clients-precise/config/definitions/calamari-clients-precise.yml
deleted file mode 100644 (file)
index 26c95b7..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-- job:
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - shell: !include-raw ../../build/build
-    description: ''
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '10'
-    name: 'calamari-clients-precise'
-    node: calamari-buildslave-precise
-    parameters:
-    - string:
-        default: ''
-        description: ''
-        name: BRANCH
-    project-type: freestyle
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/calamari-clients*deb, $BRANCH/calamari-clients-build-output.tar.gz
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - fingerprint:
-        files: $BRANCH/calamari-clients*deb, $BRANCH/calamari-clients-build-output.tar.gz
-    scm:
-    - git:
-        basedir: calamari-clients
-        branches:
-          - ${BRANCH}
-        url: https://github.com/ceph/romana.git
diff --git a/calamari-clients-rhel/build/build b/calamari-clients-rhel/build/build
deleted file mode 100644 (file)
index 0e42938..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-set -e
-test -e ${WORKSPACE}/calamari-clients-build-output.tar.gz || ( echo "no build-output tarball"; exit 1 )
-rm -f ${WORKSPACE}/calamari-clients*rpm
-cd ${WORKSPACE}/calamari-clients/vagrant/rhel-package
-vagrant destroy -f
-vagrant up --no-provision
-vagrant ssh -c 'sudo subscription-manager refresh'
-vagrant ssh -c 'sudo subscription-manager list'
-vagrant provision
-vagrant ssh -c 'sudo salt-call --local state.highstate' | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
-vagrant destroy -f
-cd $WORKSPACE
-rm -rf $BRANCH
-mkdir $BRANCH
-mv *rpm $BRANCH
diff --git a/calamari-clients-rhel/config/definitions/calamari-clients-rhel.yml b/calamari-clients-rhel/config/definitions/calamari-clients-rhel.yml
deleted file mode 100644 (file)
index 4f95e48..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-- job:
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - copyartifact:
-        filter: $BRANCH/calamari-clients-build-output.tar.gz
-        flatten: true
-        project: calamari-clients-precise-vagrant
-        target: ${WORKSPACE}
-        which-build: last-successful
-    - shell: !include-raw ../../build/build
-    description: ''
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '-1'
-    name: 'calamari-clients-rhel'
-    node: vagrant
-    parameters:
-    - string:
-        default: ''
-        description: ''
-        name: BRANCH
-    project-type: freestyle
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/calamari-clients*rpm
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - fingerprint:
-        files: $BRANCH/calamari-clients*rpm
-        record-artifacts: false
-    scm:
-    - git:
-        basedir: calamari-clients
-        branches:
-          - '*/${BRANCH}'
-        url: https://github.com/ceph/calamari-clients.git
diff --git a/calamari-clients-rhel7/build/build b/calamari-clients-rhel7/build/build
deleted file mode 100644 (file)
index 5f814fc..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-set -e
-test -e ${WORKSPACE}/calamari-clients-build-output.tar.gz || ( echo "no build-output tarball"; exit 1 )
-rm -f ${WORKSPACE}/calamari-clients*rpm
-cd ${WORKSPACE}/calamari-clients/vagrant/rhel7-package
-vagrant destroy -f
-vagrant up --no-provision
-#XXX rhel7 isn't yet subscribed
-#vagrant ssh -c 'sudo subscription-manager refresh'
-#vagrant ssh -c 'sudo subscription-manager list'
-vagrant provision
-vagrant ssh -c 'sudo salt-call --local state.highstate' | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
-vagrant destroy -f
-cd $WORKSPACE
-rm -rf $BRANCH
-mkdir $BRANCH
-mv *rpm $BRANCH
diff --git a/calamari-clients-rhel7/config/definitions/calamari-clients-rhel7.yml b/calamari-clients-rhel7/config/definitions/calamari-clients-rhel7.yml
deleted file mode 100644 (file)
index 3e833a4..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-- job:
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - copyartifact:
-        filter: $BRANCH/calamari-clients-build-output.tar.gz
-        flatten: true
-        project: calamari-clients-precise-vagrant
-        target: ${WORKSPACE}
-        which-build: last-successful
-    - shell: !include-raw ../../build/build
-    description: ''
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '-1'
-    name: 'calamari-clients-rhel7'
-    node: vagrant
-    parameters:
-    - string:
-        default: ''
-        description: ''
-        name: BRANCH
-    project-type: freestyle
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/calamari-clients*rpm
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - fingerprint:
-        files: $BRANCH/calamari-clients*rpm
-        record-artifacts: false
-    scm:
-    - git:
-        basedir: calamari-clients
-        branches:
-          - '*/${BRANCH}'
-        url: https://github.com/ceph/calamari-clients.git
diff --git a/calamari-clients-trusty/build/build b/calamari-clients-trusty/build/build
deleted file mode 100644 (file)
index e1be377..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-set -e
-test -e ${WORKSPACE}/calamari-clients-build-output.tar.gz || ( echo "no build-output tarball"; exit 1 )
-rm -f ${WORKSPACE}/calamari-clients*rpm
-cd ${WORKSPACE}/calamari-clients/vagrant/trusty-package && vagrant destroy -f && vagrant up
-vagrant ssh -c 'sudo salt-call --local state.highstate' | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
-vagrant destroy -f
-cd $WORKSPACE
-rm -rf $BRANCH
-mkdir $BRANCH
-mv *deb $BRANCH
diff --git a/calamari-clients-trusty/config/definitions/calamari-clients-trusty.yml b/calamari-clients-trusty/config/definitions/calamari-clients-trusty.yml
deleted file mode 100644 (file)
index 807fcc4..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-- job:
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - copyartifact:
-        filter: $BRANCH/calamari-clients-build-output.tar.gz
-        flatten: true
-        project: calamari-clients-precise-vagrant
-        target: ${WORKSPACE}
-        which-build: last-successful
-    - shell: !include-raw ../../build/build
-    description: ''
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '-1'
-    name: 'calamari-clients-trusty'
-    node: vagrant
-    parameters:
-    - string:
-        default: ''
-        description: ''
-        name: BRANCH
-    project-type: freestyle
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/calamari-clients*deb
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - fingerprint:
-        files: $BRANCH/calamari-clients*deb
-        record-artifacts: false
-    scm:
-    - git:
-        basedir: calamari-clients
-        branches:
-          - '*/${BRANCH}'
-        url: https://github.com/ceph/calamari-clients.git
diff --git a/calamari-clients-vagrant/build/build b/calamari-clients-vagrant/build/build
deleted file mode 100644 (file)
index 48a331b..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-set -ex
-echo "BRANCH: ${BRANCH} DIST: $dist ARCH: $arch WORKSPACE: $WORKSPACE  PWD: ${PWD}"
-ls $WORKSPACE
-rm -f $WORKSPACE/*{rpm,deb}
-ls $WORKSPACE
-cd $WORKSPACE/calamari-clients/vagrant/${dist}-package && vagrant destroy -f
-
-# CDN == PITA
-if [ ${dist:0:4} = 'rhel' ] ; then
-   vagrant up --no-provision
-   vagrant ssh -c 'sudo subscription-manager refresh; sudo subscription-manager list'
-   if [ $dist = 'rhel' ] ; then 
-      vagrant ssh -c '
-      echo "
-[server]
-name=server
-enabled=1
-gpgcheck=0
-baseurl=http://apt-mirror.front.sepia.ceph.com/rhel6repo-server
-
-[server-optional]
-name=server-optional
-enabled=1
-gpgcheck=0
-baseurl=http://apt-mirror.front.sepia.ceph.com/rhel6repo-server-optional" | sudo tee /etc/yum.repos.d/local.repo'
-      vagrant ssh -c 'sudo yum clean all'
-      vagrant ssh -c 'sudo yum makecache'
-   fi
-   vagrant provision   
-else
-   vagrant up
-fi
-vagrant up
-
-vagrant ssh -c 'sudo salt-call --local state.highstate' | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
-vagrant destroy -f
-rm -rf $WORKSPACE/$BRANCH
-mkdir $WORKSPACE/$BRANCH
-find $WORKSPACE -maxdepth 1 -name '*.deb' -print0 -o -name '*.rpm' -print0 -o -name 'calamari-clients.build.output.tar.gz' -print0 | xargs --verbose -0 -I'{}' mv '{}' $WORKSPACE/$BRANCH
diff --git a/calamari-clients-vagrant/config/definitions/calamari-clients-vagrant.yml b/calamari-clients-vagrant/config/definitions/calamari-clients-vagrant.yml
deleted file mode 100644 (file)
index 3c3e856..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-- job:
-    axes:
-    - axis:
-        name: arch
-        type: label-expression
-        values:
-        - x86_64
-    - axis:
-        name: dist
-        type: label-expression
-        values:
-        - centos
-        - rhel
-        - rhel7
-        - trusty
-        - wheezy
-    - axis:
-        name: label
-        type: slave
-        values:
-        - vagrant
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - copyartifact:
-        exclude-pattern: ''
-        filter: $BRANCH/calamari-clients-build-output.tar.gz
-        flatten: true
-        project: calamari-clients-precise-vagrant
-        target: $WORKSPACE
-        which-build: last-successful
-    - shell: !include-raw ../../build/build
-    combination-filter: dist != "wheezy"
-    description: Build all the non-precise distros (which really means "package them")
-    execution-strategy:
-      run-sequentially: false
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '-1'
-    name: 'calamari-clients-vagrant'
-    node: vagrant
-    parameters:
-    - string:
-        default: master
-        description: ''
-        name: BRANCH
-    project-type: matrix
-    properties:
-    - github:
-        url: https://github.com/ceph/calamari-clients
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/*
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    scm:
-    - git:
-        basedir: calamari-clients
-        branches:
-          - '*/$BRANCH'
-        url: https://github.com/ceph/calamari-clients.git
diff --git a/calamari-clients-wheezy/build/build b/calamari-clients-wheezy/build/build
deleted file mode 100644 (file)
index 2c9495b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-set -e
-test -e ${WORKSPACE}/calamari-clients-build-output.tar.gz || ( echo "no build-output tarball"; exit 1 )
-rm -f ${WORKSPACE}/calamari-clients*deb
-cd ${WORKSPACE}/calamari-clients/vagrant/wheezy-package && vagrant destroy -f && vagrant up
-vagrant ssh -c 'sudo salt-call --local state.highstate' | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
-vagrant destroy -f
-cd $WORKSPACE
-rm -rf $BRANCH
-mkdir $BRANCH
-mv *deb $BRANCH
diff --git a/calamari-clients-wheezy/config/definitions/calamari-clients-wheezy.yml b/calamari-clients-wheezy/config/definitions/calamari-clients-wheezy.yml
deleted file mode 100644 (file)
index cd56dba..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-- job:
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - copyartifact:
-        filter: $BRANCH/calamari-clients-build-output.tar.gz
-        flatten: true
-        project: calamari-clients-precise-vagrant
-        target: ${WORKSPACE}
-        which-build: last-successful
-    - shell: !include-raw ../../build/build
-    description: ''
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '-1'
-    name: 'calamari-clients-wheezy'
-    node: vagrant
-    parameters:
-    - string:
-        default: ''
-        description: ''
-        name: BRANCH
-    project-type: freestyle
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/calamari-clients*deb
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - fingerprint:
-        files: $BRANCH/calamari-clients*deb
-        record-artifacts: false
-    scm:
-    - git:
-        basedir: calamari-clients
-        branches:
-          - '*/${BRANCH}'
-        url: https://github.com/ceph/calamari-clients.git
diff --git a/calamari-server-centos/build/build b/calamari-server-centos/build/build
deleted file mode 100644 (file)
index 224167d..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-set -e
-echo "Building ${BRANCH}"
-echo "${SALT_BOOTSTRAP_URL}"
-rm -f ${WORKSPACE}/*rpm ${WORKSPACE}/calamari-repo-el6.tar.gz
-cd ${WORKSPACE}/calamari/vagrant/centos-build && vagrant destroy -f
-vagrant up
-vagrant ssh -c 'sudo salt-call --local state.highstate' | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
-vagrant destroy -f
-cd $WORKSPACE
-rm -rf $BRANCH
-mkdir $BRANCH
-mv *rpm $BRANCH
-mv calamari-repo-el6.tar.gz $BRANCH
diff --git a/calamari-server-centos/config/definitions/calamari-server-centos.yml b/calamari-server-centos/config/definitions/calamari-server-centos.yml
deleted file mode 100644 (file)
index ff51591..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-- job:
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - shell: !include-raw ../../build/build
-    description: ''
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '-1'
-    name: 'calamari-server-centos'
-    node: vagrant
-    parameters:
-    - string:
-        default: ''
-        description: ''
-        name: BRANCH
-    project-type: freestyle
-    properties:
-    - github:
-        url: https://github.com/ceph/calamari/
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/*.rpm,$BRANCH/calamari-repo-el6.tar.gz
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - fingerprint:
-        files: $BRANCH/*.rpm,$BRANCH/calamari-repo-el6.tar.gz
-    scm:
-    - git:
-        basedir: Diamond
-        branches:
-          - '*/calamari'
-        url: git@github.com:ceph/Diamond
diff --git a/calamari-server-precise/build/build b/calamari-server-precise/build/build
deleted file mode 100644 (file)
index 8786999..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-set -e
-echo "Building ${BRANCH}"
-rm -f ${WORKSPACE}/*.deb ${WORKSPACE}/calamari-repo-precise.tar.gz
-cd ${WORKSPACE}/calamari/vagrant/precise-build && vagrant destroy -f
-vagrant up
-vagrant ssh -c 'sudo salt-call --local state.highstate' | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
-vagrant destroy -f
-cd $WORKSPACE
-rm -rf $BRANCH
-mkdir $BRANCH
-mv *deb $BRANCH
-mv calamari-repo-precise.tar.gz $BRANCH
diff --git a/calamari-server-precise/config/definitions/calamari-server-precise.yml b/calamari-server-precise/config/definitions/calamari-server-precise.yml
deleted file mode 100644 (file)
index c6d0104..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-- job:
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - shell: !include-raw ../../build/build
-    description: ''
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '-1'
-    name: 'calamari-server-precise'
-    node: vagrant
-    parameters:
-    - string:
-        default: ''
-        description: ''
-        name: BRANCH
-    project-type: freestyle
-    properties:
-    - github:
-        url: https://github.com/ceph/calamari/
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/*.deb,$BRANCH/calamari-repo-precise.tar.gz
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - fingerprint:
-        files: $BRANCH/*.deb,$BRANCH/calamari-repo-precise.tar.gz
-    scm:
-    - git:
-        basedir: Diamond
-        branches:
-          - '*/calamari'
-        url: git@github.com:ceph/Diamond
diff --git a/calamari-server-rhel/build/build b/calamari-server-rhel/build/build
deleted file mode 100644 (file)
index 89ee16d..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-set -e
-echo "Building ${BRANCH}"
-rm -f ${WORKSPACE}/*rpm ${WORKSPACE}/calamari-repo-rhel6.tar.gz
-cd ${WORKSPACE}/calamari/vagrant/rhel-build && vagrant destroy -f
-vagrant up --no-provision
-vagrant ssh -c 'sudo subscription-manager refresh; sudo subscription-manager list'
-vagrant provision
-vagrant ssh -c 'sudo salt-call --local state.highstate' | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
-vagrant destroy -f
-cd $WORKSPACE
-rm -rf $BRANCH
-mkdir $BRANCH
-mv *rpm $BRANCH
-mv calamari-repo-rhel6.tar.gz $BRANCH
diff --git a/calamari-server-rhel/config/definitions/calamari-server-rhel.yml b/calamari-server-rhel/config/definitions/calamari-server-rhel.yml
deleted file mode 100644 (file)
index 657da03..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-- job:
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - shell: !include-raw ../../build/build
-    description: ''
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '-1'
-    name: 'calamari-server-rhel'
-    node: vagrant
-    parameters:
-    - string:
-        default: ''
-        description: ''
-        name: BRANCH
-    project-type: freestyle
-    properties:
-    - github:
-        url: https://github.com/ceph/calamari/
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/*.rpm,$BRANCH/calamari-repo-rhel6.tar.gz
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - fingerprint:
-        files: $BRANCH/*.rpm,$BRANCH/calamari-repo-rhel6.tar.gz
-    scm:
-    - git:
-        basedir: Diamond
-        branches:
-          - '*/calamari'
-        url: git@github.com:ceph/Diamond
diff --git a/calamari-server-rhel7/build/build b/calamari-server-rhel7/build/build
deleted file mode 100644 (file)
index 0c8db0a..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-set -e
-echo "Building ${BRANCH}"
-rm -f ${WORKSPACE}/*rpm ${WORKSPACE}/calamari-repo-rhel7.tar.gz
-cd ${WORKSPACE}/calamari/vagrant/rhel7-build
-vagrant destroy -f
-vagrant up
-vagrant ssh -c 'sudo salt-call --local state.highstate' | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
-vagrant destroy -f
-cd $WORKSPACE
-rm -rf $BRANCH
-mkdir $BRANCH
-mv *rpm $BRANCH
-mv calamari-repo-rhel7.tar.gz $BRANCH
diff --git a/calamari-server-rhel7/config/definitions/calamari-server-rhel7.yml b/calamari-server-rhel7/config/definitions/calamari-server-rhel7.yml
deleted file mode 100644 (file)
index 06be515..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-- job:
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - shell: !include-raw ../../build/build
-    description: ''
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '10'
-    name: 'calamari-server-rhel7'
-    node: vagrant
-    parameters:
-    - string:
-        default: ''
-        description: ''
-        name: BRANCH
-    project-type: freestyle
-    properties:
-    - github:
-        url: https://github.com/ceph/calamari/
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/*.rpm,$BRANCH/calamari-repo-rhel7.tar.gz
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - fingerprint:
-        files: $BRANCH/*.rpm,$BRANCH/calamari-repo-rhel7.tar.gz
-    scm:
-    - git:
-        basedir: Diamond
-        branches:
-          - '*/calamari'
-        url: git@github.com:ceph/Diamond
diff --git a/calamari-server-trusty/build/build b/calamari-server-trusty/build/build
deleted file mode 100644 (file)
index 7e384e2..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-set -e
-
-pkgs=( "chacractl>=0.0.4" )
-install_python_packages "pkgs[@]"
-
-# create the .chacractl config file using global variables
-make_chacractl_config
-
-echo "Building ${BRANCH}"
-rm -f ${WORKSPACE}/*.deb ${WORKSPACE}/calamari-repo-trusty.tar.gz
-cd ${WORKSPACE}/
-
-sudo apt-get -y install python-software-properties
-sudo add-apt-repository -y ppa:saltstack/salt
-sudo apt-get update
-wget -q -O- 'https://download.ceph.com/keys/release.asc' | sudo apt-key add -
-ssh-keyscan $(hostname -f)| sudo tee -a /root/.ssh/known_hosts
-sudo apt-get -y install salt-minion salt-common python-jinja2 multitee
-
-sudo -E salt-call --local --file-root=$(pwd)/vagrant/trusty-build/salt/roots state.highstate | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
-cd $WORKSPACE
-rm -rf $BRANCH
-mkdir $BRANCH
-mv pkgs/*deb $BRANCH
-
-[ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH"
-DISTRO=`python -c "exec 'import platform; print platform.linux_distribution()[0].lower()'"`
-chacra_endpoint="calamari-server/${chacra_ref}/${GIT_COMMIT}/${DISTRO}/universal/all"
-
-[ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags=""
-
-# push binaries to chacra
-find "$BRANCH" | grep 'deb$' | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}
diff --git a/calamari-server-trusty/config/definitions/calamari-server-trusty.yml b/calamari-server-trusty/config/definitions/calamari-server-trusty.yml
deleted file mode 100644 (file)
index 8847b41..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - shell:
-          !include-raw:
-            - ../../../scripts/build_utils.sh
-            - ../../build/build
-    description: ''
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '-1'
-    name: 'calamari-server-trusty'
-    node: small && trusty
-    parameters:
-    - string:
-        default: ''
-        description: ''
-        name: BRANCH
-    project-type: freestyle
-    properties:
-    - github:
-        url: https://github.com/ceph/calamari/
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/*.deb,$BRANCH/calamari-repo-trusty.tar.gz
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - fingerprint:
-        files: $BRANCH/*.deb,$BRANCH/calamari-repo-trusty.tar.gz
-    scm:
-      - git:
-          url: https://github.com/ceph/calamari.git
-          branches:
-            - $BRANCH
-          browser: auto
-          skip-tag: true
-          timeout: 20
-          wipe-workspace: true
-
-    wrappers:
-      - inject-passwords:
-          global: true
-          mask-password-params: true
diff --git a/calamari-server-vagrant/build/build b/calamari-server-vagrant/build/build
deleted file mode 100644 (file)
index 2a93cba..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-set -ex
-echo "BRANCH: ${BRANCH} DIST: $dist ARCH: $arch WORKSPACE: $WORKSPACE  PWD: ${PWD}"
-ls $WORKSPACE
-rm -f $WORKSPACE/*{rpm,deb} $WORKSPACE/calamari-repo-*.tar.gz
-ls $WORKSPACE
-cd $WORKSPACE/calamari/vagrant/${dist}-build && vagrant destroy -f
-
-# CDN == PITA
-if [ ${dist:0:4} = 'rhel' ] ; then
-   vagrant up --no-provision
-   vagrant ssh -c 'sudo subscription-manager refresh; sudo subscription-manager list'
-   vagrant provision
-else
-   vagrant up
-fi
-
-vagrant ssh -c 'mkdir ~/.pip; echo -e "[global]\nindex-url = http://apt-mirror.front.sepia.ceph.com/pypi/simple\n" >~/.pip/pip.conf'
-
-vagrant ssh -c 'sudo salt-call --local state.highstate' | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
-vagrant destroy -f
-rm -rf $WORKSPACE/$BRANCH
-mkdir $WORKSPACE/$BRANCH
-find $WORKSPACE -maxdepth 1 -name '*.deb' -print0 -o -name '*.rpm' -print0 -o -name 'calamari-repo-*.tar.gz' -print0 | xargs --verbose -0 -I'{}' mv '{}' $WORKSPACE/$BRANCH
diff --git a/calamari-server-vagrant/config/definitions/calamari-server-vagrant.yml b/calamari-server-vagrant/config/definitions/calamari-server-vagrant.yml
deleted file mode 100644 (file)
index 953fcc1..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-- job:
-    axes:
-    - axis:
-        name: arch
-        type: label-expression
-        values:
-        - x86_64
-    - axis:
-        name: dist
-        type: label-expression
-        values:
-        - centos
-        - rhel
-        - rhel7
-        - precise
-        - trusty
-        - wheezy
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - shell: !include-raw ../../build/build
-    combination-filter: dist != "wheezy"
-    description: ''
-    execution-strategy:
-      run-sequentially: false
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '-1'
-    name: 'calamari-server-vagrant'
-    node: vagrant
-    parameters:
-    - string:
-        default: master
-        description: ''
-        name: BRANCH
-    project-type: matrix
-    properties:
-    - github:
-        url: https://github.com/ceph/calamari/
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/*
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    scm:
-    - git:
-        basedir: Diamond
-        branches:
-          - '*/calamari'
-        url: git@github.com:ceph/Diamond
diff --git a/calamari-server-wheezy/build/build b/calamari-server-wheezy/build/build
deleted file mode 100644 (file)
index 2fa9698..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-set -e
-echo "Building ${BRANCH}"
-rm -f ${WORKSPACE}/*.deb ${WORKSPACE}/calamari-repo-wheezy.tar.gz
-cd ${WORKSPACE}/calamari/vagrant/wheezy-build && vagrant destroy -f
-vagrant up
-vagrant ssh -c 'sudo salt-call --local state.highstate' | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
-vagrant destroy -f
-cd $WORKSPACE
-rm -rf $BRANCH
-mkdir $BRANCH
-mv *deb $BRANCH
-mv calamari-repo-wheezy.tar.gz $BRANCH
diff --git a/calamari-server-wheezy/config/definitions/calamari-server-wheezy.yml b/calamari-server-wheezy/config/definitions/calamari-server-wheezy.yml
deleted file mode 100644 (file)
index ef675b5..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-- job:
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - shell: !include-raw ../../build/build
-    description: ''
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '-1'
-    name: 'calamari-server-wheezy'
-    node: vagrant
-    parameters:
-    - string:
-        default: ''
-        description: ''
-        name: BRANCH
-    project-type: freestyle
-    properties:
-    - github:
-        url: https://github.com/ceph/calamari/
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/*.deb,$BRANCH/calamari-repo-wheezy.tar.gz
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - fingerprint:
-        files: $BRANCH/*.deb,$BRANCH/calamari-repo-wheezy.tar.gz
-    scm:
-    - git:
-        basedir: Diamond
-        branches:
-          - '*/calamari'
-        url: git@github.com:ceph/Diamond
diff --git a/calamari-server/build/build b/calamari-server/build/build
deleted file mode 100644 (file)
index abca6db..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-set -ex
-echo "BRANCH: ${BRANCH} DIST: $dist ARCH: $arch WORKSPACE: $WORKSPACE  PWD: ${PWD}"
-ls $WORKSPACE
-rm -f $WORKSPACE/*{rpm,deb} $WORKSPACE/calamari-repo-*.tar.gz
-ls $WORKSPACE
-
-# CDN == PITA
-if [ "${dist:0:4}" = "rhel" -a "${dist:4}" != "7" ] ; then
-   sudo subscription-manager refresh; sudo subscription-manager list
-fi
-
-sudo -E salt-call --file-root $WORKSPACE/calamari/vagrant/${dist}-build/salt/roots \
-  --local state.highstate  | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
-rm /tmp/${BUILD_TAG}.out
-if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi 
-
-rm -rf $WORKSPACE/$BRANCH
-mkdir $WORKSPACE/$BRANCH
-find $WORKSPACE/pkgs -maxdepth 1 -name '*.deb' -print0 -o -name '*.rpm' -print0 \
- -o -name 'calamari-repo-*.tar.gz' -print0 | xargs --verbose -0 -I'{}' mv '{}' $WORKSPACE/$BRANCH
diff --git a/calamari-server/config/definitions/calamari-server.yml b/calamari-server/config/definitions/calamari-server.yml
deleted file mode 100644 (file)
index 9018a13..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-- job:
-    axes:
-    - axis:
-        name: arch
-        type: label-expression
-        values:
-        - x86_64
-    - axis:
-        name: dist
-        type: label-expression
-        values:
-        - centos
-        - rhel
-        - rhel7
-        - precise
-        - trusty
-        - wheezy
-    - axis:
-        name: label
-        type: slave
-        values:
-        - calamari-buildslave
-    block-downstream: false
-    block-upstream: false
-    builders:
-    - shell: !include-raw ../../build/build
-    combination-filter: dist != 'wheezy'  && dist != 'rhel'
-    description: ''
-    execution-strategy:
-      run-sequentially: false
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '-1'
-      numToKeep: '-1'
-    name: 'calamari-server'
-    node: calamari-buildslave
-    parameters:
-    - string:
-        default: master
-        description: ''
-        name: BRANCH
-    project-type: matrix
-    properties:
-    - github:
-        url: https://github.com/ceph/calamari/
-    publishers:
-    - archive:
-        allow-empty: false
-        artifacts: $BRANCH/*
-        default-excludes: true
-        fingerprint: false
-        only-if-success: false
-    - description-setter:
-        description: \1
-        regexp: 'BRANCH: (\S+)'
-        regexp-for-failed: ''
-        set-for-matrix: false
-    scm:
-    - git:
-        basedir: Diamond
-        branches:
-          - '*/calamari'
-        url: git@github.com:ceph/Diamond