From 94dfbfd93e36a88a38909a4c4e55bafccafd2737 Mon Sep 17 00:00:00 2001 From: gmeno Date: Wed, 2 Nov 2016 10:12:34 -0700 Subject: [PATCH] cleanup stale calamari* projects Signed-off-by: gmeno --- calamari-clients-centos/build/build | 30 --------- .../definitions/calamari-clients-centos.yml | 41 ------------ calamari-clients-precise-vagrant/build/build | 15 ----- .../calamari-clients-precise-vagrant.yml | 34 ---------- calamari-clients-precise/build/build | 9 --- .../definitions/calamari-clients-precise.yml | 34 ---------- calamari-clients-rhel/build/build | 18 ----- .../definitions/calamari-clients-rhel.yml | 41 ------------ calamari-clients-rhel7/build/build | 19 ------ .../definitions/calamari-clients-rhel7.yml | 41 ------------ calamari-clients-trusty/build/build | 13 ---- .../definitions/calamari-clients-trusty.yml | 41 ------------ calamari-clients-vagrant/build/build | 43 ------------ .../definitions/calamari-clients-vagrant.yml | 65 ------------------- calamari-clients-wheezy/build/build | 13 ---- .../definitions/calamari-clients-wheezy.yml | 41 ------------ calamari-server-centos/build/build | 16 ----- .../definitions/calamari-server-centos.yml | 37 ----------- calamari-server-precise/build/build | 15 ----- .../definitions/calamari-server-precise.yml | 37 ----------- calamari-server-rhel/build/build | 17 ----- .../definitions/calamari-server-rhel.yml | 37 ----------- calamari-server-rhel7/build/build | 16 ----- .../definitions/calamari-server-rhel7.yml | 37 ----------- calamari-server-trusty/build/build | 37 ----------- .../definitions/calamari-server-trusty.yml | 48 -------------- calamari-server-vagrant/build/build | 27 -------- .../definitions/calamari-server-vagrant.yml | 54 --------------- calamari-server-wheezy/build/build | 15 ----- .../definitions/calamari-server-wheezy.yml | 37 ----------- calamari-server/build/build | 22 ------- .../config/definitions/calamari-server.yml | 64 ------------------ 32 files changed, 1014 deletions(-) delete mode 100644 calamari-clients-centos/build/build delete mode 100644 calamari-clients-centos/config/definitions/calamari-clients-centos.yml delete mode 100644 calamari-clients-precise-vagrant/build/build delete mode 100644 calamari-clients-precise-vagrant/config/definitions/calamari-clients-precise-vagrant.yml delete mode 100644 calamari-clients-precise/build/build delete mode 100644 calamari-clients-precise/config/definitions/calamari-clients-precise.yml delete mode 100644 calamari-clients-rhel/build/build delete mode 100644 calamari-clients-rhel/config/definitions/calamari-clients-rhel.yml delete mode 100644 calamari-clients-rhel7/build/build delete mode 100644 calamari-clients-rhel7/config/definitions/calamari-clients-rhel7.yml delete mode 100644 calamari-clients-trusty/build/build delete mode 100644 calamari-clients-trusty/config/definitions/calamari-clients-trusty.yml delete mode 100644 calamari-clients-vagrant/build/build delete mode 100644 calamari-clients-vagrant/config/definitions/calamari-clients-vagrant.yml delete mode 100644 calamari-clients-wheezy/build/build delete mode 100644 calamari-clients-wheezy/config/definitions/calamari-clients-wheezy.yml delete mode 100644 calamari-server-centos/build/build delete mode 100644 calamari-server-centos/config/definitions/calamari-server-centos.yml delete mode 100644 calamari-server-precise/build/build delete mode 100644 calamari-server-precise/config/definitions/calamari-server-precise.yml delete mode 100644 calamari-server-rhel/build/build delete mode 100644 calamari-server-rhel/config/definitions/calamari-server-rhel.yml delete mode 100644 calamari-server-rhel7/build/build delete mode 100644 calamari-server-rhel7/config/definitions/calamari-server-rhel7.yml delete mode 100644 calamari-server-trusty/build/build delete mode 100644 calamari-server-trusty/config/definitions/calamari-server-trusty.yml delete mode 100644 calamari-server-vagrant/build/build delete mode 100644 calamari-server-vagrant/config/definitions/calamari-server-vagrant.yml delete mode 100644 calamari-server-wheezy/build/build delete mode 100644 calamari-server-wheezy/config/definitions/calamari-server-wheezy.yml delete mode 100644 calamari-server/build/build delete mode 100644 calamari-server/config/definitions/calamari-server.yml diff --git a/calamari-clients-centos/build/build b/calamari-clients-centos/build/build deleted file mode 100644 index 866612d9..00000000 --- a/calamari-clients-centos/build/build +++ /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 index c53d3344..00000000 --- a/calamari-clients-centos/config/definitions/calamari-clients-centos.yml +++ /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 index 68865ba2..00000000 --- a/calamari-clients-precise-vagrant/build/build +++ /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 index 1caafd18..00000000 --- a/calamari-clients-precise-vagrant/config/definitions/calamari-clients-precise-vagrant.yml +++ /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 index b414aaf8..00000000 --- a/calamari-clients-precise/build/build +++ /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 index 26c95b76..00000000 --- a/calamari-clients-precise/config/definitions/calamari-clients-precise.yml +++ /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 index 0e429388..00000000 --- a/calamari-clients-rhel/build/build +++ /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 index 4f95e488..00000000 --- a/calamari-clients-rhel/config/definitions/calamari-clients-rhel.yml +++ /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 index 5f814fc3..00000000 --- a/calamari-clients-rhel7/build/build +++ /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 index 3e833a47..00000000 --- a/calamari-clients-rhel7/config/definitions/calamari-clients-rhel7.yml +++ /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 index e1be3775..00000000 --- a/calamari-clients-trusty/build/build +++ /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 index 807fcc4f..00000000 --- a/calamari-clients-trusty/config/definitions/calamari-clients-trusty.yml +++ /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 index 48a331b0..00000000 --- a/calamari-clients-vagrant/build/build +++ /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 index 3c3e8569..00000000 --- a/calamari-clients-vagrant/config/definitions/calamari-clients-vagrant.yml +++ /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 index 2c9495ba..00000000 --- a/calamari-clients-wheezy/build/build +++ /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 index cd56dba6..00000000 --- a/calamari-clients-wheezy/config/definitions/calamari-clients-wheezy.yml +++ /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 index 224167d1..00000000 --- a/calamari-server-centos/build/build +++ /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 index ff51591b..00000000 --- a/calamari-server-centos/config/definitions/calamari-server-centos.yml +++ /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 index 87869996..00000000 --- a/calamari-server-precise/build/build +++ /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 index c6d0104e..00000000 --- a/calamari-server-precise/config/definitions/calamari-server-precise.yml +++ /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 index 89ee16df..00000000 --- a/calamari-server-rhel/build/build +++ /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 index 657da031..00000000 --- a/calamari-server-rhel/config/definitions/calamari-server-rhel.yml +++ /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 index 0c8db0a3..00000000 --- a/calamari-server-rhel7/build/build +++ /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 index 06be515c..00000000 --- a/calamari-server-rhel7/config/definitions/calamari-server-rhel7.yml +++ /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 index 7e384e2d..00000000 --- a/calamari-server-trusty/build/build +++ /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 index 8847b411..00000000 --- a/calamari-server-trusty/config/definitions/calamari-server-trusty.yml +++ /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 index 2a93cba9..00000000 --- a/calamari-server-vagrant/build/build +++ /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 index 953fcc18..00000000 --- a/calamari-server-vagrant/config/definitions/calamari-server-vagrant.yml +++ /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 index 2fa96989..00000000 --- a/calamari-server-wheezy/build/build +++ /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 index ef675b5b..00000000 --- a/calamari-server-wheezy/config/definitions/calamari-server-wheezy.yml +++ /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 index abca6db6..00000000 --- a/calamari-server/build/build +++ /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 index 9018a130..00000000 --- a/calamari-server/config/definitions/calamari-server.yml +++ /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 -- 2.39.5