From: Ken Dreyer Date: Mon, 6 Jul 2015 16:52:49 +0000 (-0600) Subject: rm top-level "jenkins" directory X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20b468c3bfd5befa7eb8fc4f8003ee9090a47ba2;p=ceph-build.git rm top-level "jenkins" directory Prior to the introduction of Jenkins Job Builder for configuring our jobs, we stored each of Ceph's build instructions in a "jenkins" directory. This was a first crude step towards versioning our build instructions. These "jenkins/*" scripts are no longer necessary because the JJB job definitions contain the same steps (and these scripts are no longer used). Clean them up. --- diff --git a/jenkins/build b/jenkins/build deleted file mode 100644 index 645f3df4..00000000 --- a/jenkins/build +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# This is a script that runs inside Jenkins. -# http://jenkins.ceph.com/job/ceph-build/ - -set -x -set -e - -# Jenkins will set $RELEASE as a parameter in the job configuration. -if $RELEASE ; then - # This is a formal release. Sign it with the release key. - export GNUPGHOME=/home/jenkins-build/build/gnupg.ceph-release/ - export KEYID=17ED316D -else - # This is an automatic build. Sign it with the autobuild key. - export GNUPGHOME=/home/jenkins-build/build/gnupg.autobuild/ - export KEYID=03C3951A -fi - -HOST=$(hostname --short) -echo "Building on $(hostname) Date: $(date)" -echo " DIST=${DIST}" -echo " BPTAG=${BPTAG}" -echo " KEYID=${KEYID}" -echo " WS=$WORKSPACE" -echo " PWD=$(pwd)" -echo " BUILD SOURCE=$COPYARTIFACT_BUILD_NUMBER_CEPH_SETUP" -echo "*****" -env -echo "*****" - -if [ ! -d ceph-build ] ; then - echo "Build tools are not installed" - exit 1 -fi -bindir=$(pwd)/ceph-build - -case $HOST in -gitbuilder-cdep-deb* | tala* | mira*) - if [ ! -d /srv/debian-base ] ; then - echo "debian base is not installed" - exit 1 - fi - ;; -esac - - -vers=`cat ./dist/version` -# create a release directory for ceph-build tools -mkdir -p release -cp -a dist release/${vers} -echo $DIST > release/${vers}/debian_dists -echo "${vers}-1" > release/${vers}/debian_version - -case $HOST in - -gitbuilder-cdep-deb* | tala* | mira*) - - cd release/$vers - - # unpack sources - dpkg-source -x ceph_${vers}-1.dsc - ( cd ceph-${vers} - #DEB_VERSION=$(dpkg-parsechangelog | sed -rne 's,^Version: (.*),\1, p' | cut -d'-' -f1) - DEB_VERSION=$(dpkg-parsechangelog | sed -rne 's,^Version: (.*),\1, p') - #BP_VERSION=${DEB_VERSION}-1${BPTAG} - BP_VERSION=${DEB_VERSION}${BPTAG} - DEBEMAIL="gary.lowell@inktank.com" dch -D $DIST --force-distribution -b -v "$BP_VERSION" "$comment" - ) - dpkg-source -b ceph-${vers} - - echo "Building Debian" - cd "$WORKSPACE" - sudo $bindir/build_debs.sh ./release /srv/debian-base $vers - - #Collect Artifacts - mkdir -p dist/debian - cp -a release/$vers/*.changes dist/debian/. - cp -a release/$vers/*.deb dist/debian/. - cp -a release/$vers/*.dsc dist/debian/. - cp -a release/$vers/*.diff.gz dist/debian/. - cp -a release/$vers/*.tar.gz dist/debian/. - - ;; - -*) - echo "Building RPMs" - $bindir/build_rpms.sh ./release $vers - - #Collect Artifacts - mkdir -p dist/rpm/${DIST} - mv release/${vers}/rpm/*/SRPMS ./dist/rpm/${DIST}/. - mv release/${vers}/rpm/*/RPMS/* ./dist/rpm/${DIST}/. - ;; - -esac -echo "End Date: $(date)" diff --git a/jenkins/package b/jenkins/package deleted file mode 100644 index d5ead283..00000000 --- a/jenkins/package +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# This is a script that runs inside Jenkins. -# http://jenkins.ceph.com/job/ceph-package/ - -set -x -set -e - -# -for dir in * ; do - echo $dir - arch=$(echo $dir | cut -d',' -f1 | cut -d'=' -f2) - dist=$(echo $dir | cut -d',' -f2 | cut -d'=' -f2 | cut -d'-' -f1) - echo "arch = $arch, dist = $dist" - if [ -d $dir/dist/rpm ] ; then - echo "rpms" - fi - if [ -d $dir/dist/debian ] ; then - echo "debian" - fi -done diff --git a/jenkins/setup b/jenkins/setup deleted file mode 100644 index bfec5d08..00000000 --- a/jenkins/setup +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -# This is a script that runs inside Jenkins. -# http://jenkins.ceph.com/job/ceph-setup/ - -set -x -set -e - -# Jenkins will set $RELEASE as a parameter in the job configuration. -if $RELEASE ; then - # This is a formal release. Sign it with the release key. - export GNUPGHOME=/home/jenkins-build/build/gnupg.ceph-release/ - export KEYID=17ED316D -else - # This is an automatic build. Sign it with the autobuild key. - export GNUPGHOME=/home/jenkins-build/build/gnupg.autobuild/ - export KEYID=03C3951A -fi - -HOST=$(hostname --short) -echo "Building on ${HOST}" -echo " DIST=${DIST}" -echo " BPTAG=${BPTAG}" -echo " KEYID=${KEYID}" -echo " WS=$WORKSPACE" -echo " PWD=$(pwd)" -echo " BRANCH=$BRANCH" - -if [ -x "$BRANCH" ] ; then - echo "No git branch was supplied" - exit 1 -fi - -echo "Building version $(git describe) Branch $Branch" - -if [ ! -d ceph-build ] ; then - echo "Build tools are not installed" - exit 1 -fi -bindir=$(pwd)/ceph-build -rm -rf dist -rm -rf release - -# fix version/release. Hack needed only for the spec -# file for rc candidates. -#export force=force -#sed -i 's/^Version:.*/Version: 0.72/' ceph.spec.in -#sed -i 's/^Release:.*/Release: rc1%{?dist}/' ceph.spec.in -#sed -i 's/^Source0:.*/Source0: http:\/\/ceph.com\/download\/%{name}-%{version}-rc1.tar.bz2/' ceph.spec.in -#sed -i 's/^%setup.*/%setup -q -n %{name}-%{version}-rc1/' ceph.spec.in - -echo "Running configure ..." -./do_autogen.sh -if [ $? -ne 0 ] ; then - echo "autogen failed" - exit 1 -fi - -mkdir -p release -$bindir/release_tarball.sh release release/version -if [ $? -ne 0 ] ; then - echo "make tarballs failed" - exit 2 -fi -vers=`cat release/version` - -( - cd release/$vers - mv debian ceph-$vers/. - dpkg-source -b ceph-$vers -) - -mkdir -p dist -# Debian Source Files -mv release/$vers/*.dsc dist/. -if [ "$(ls release/$vers/*.diff.gz)" ]; then - mv release/$vers/*.diff.gz dist/. -fi -mv release/$vers/*.orig.tar.gz dist/. -# RPM Source Files -mv release/$vers/ceph.spec dist/. -mv release/$vers/*.tar.* dist/. -# Parameters -mv release/version dist/. -exit 0