]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
Remove separate -arm64 versions and integrate into main jobs 348/head
authorDan Mick <dan.mick@redhat.com>
Fri, 1 Apr 2016 04:55:50 +0000 (21:55 -0700)
committerDan Mick <dan.mick@redhat.com>
Tue, 5 Apr 2016 01:43:13 +0000 (18:43 -0700)
Signed-off-by: Dan Mick <dan.mick@redhat.com>
ceph-build-arm64/build/build_deb [deleted file]
ceph-build-arm64/build/build_rpm [deleted file]
ceph-build-arm64/build/setup [deleted file]
ceph-build-arm64/build/setup_pbuilder [deleted file]
ceph-build-arm64/config/definitions/ceph-build-arm64.yml [deleted file]
ceph-build/config/definitions/ceph-build.yml
ceph-setup-arm64/build/build [deleted file]
ceph-setup-arm64/config/definitions/ceph-setup.yml [deleted file]

diff --git a/ceph-build-arm64/build/build_deb b/ceph-build-arm64/build/build_deb
deleted file mode 100644 (file)
index 3c0888b..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/bin/bash
-set -ex
-
-# Only do actual work when we are a DEB distro
-if test -f /etc/redhat-release ; then
-    exit 0
-fi
-
-VENV="$WORKSPACE/venv/bin"
-
-get_bptag() {
-    dist=$1
-
-    [ "$dist" = "sid" ] && dver=""
-    [ "$dist" = "jessie" ] && dver="~bpo80+1"
-    [ "$dist" = "wheezy" ] && dver="~bpo70+1"
-    [ "$dist" = "squeeze" ] && dver="~bpo60+1"
-    [ "$dist" = "lenny" ] && dver="~bpo50+1"
-    [ "$dist" = "xenial" ] && dver="$dist"
-    [ "$dist" = "trusty" ] && dver="$dist"
-    [ "$dist" = "saucy" ] && dver="$dist"
-    [ "$dist" = "precise" ] && dver="$dist"
-    [ "$dist" = "oneiric" ] && dver="$dist"
-    [ "$dist" = "natty" ] && dver="$dist"
-    [ "$dist" = "maverick" ] && dver="$dist"
-    [ "$dist" = "lucid" ] && dver="$dist"
-    [ "$dist" = "karmic" ] && dver="$dist"
-
-    echo $dver
-}
-
-BPTAG=`get_bptag $DIST`
-
-# slap -rc to the ref if we are doing a release-candidate build
-[ "$RC" = true ] && chacra_ref="$BRANCH-rc" || chacra_ref="$BRANCH"
-[ "$TEST" = true ] && chacra_ref="test"
-vers=`cat ./dist/version`
-distro=`python -c "exec 'import platform; print platform.linux_distribution()[0].lower()'"`
-chacra_endpoint="ceph/${chacra_ref}/${distro}/${DIST}/${ARCH}"
-
-# this exists in scripts/build_utils.sh
-check_binary_existence $chacra_endpoint
-
-HOST=$(hostname --short)
-echo "Building on $(hostname)"
-echo "  DIST=${DIST}"
-echo "  BPTAG=${BPTAG}"
-echo "  WS=$WORKSPACE"
-echo "  PWD=$(pwd)"
-echo "  BUILD SOURCE=$COPYARTIFACT_BUILD_NUMBER_CEPH_SETUP"
-echo "*****"
-env
-echo "*****"
-
-# 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
-
-cd release/$vers
-
-
-# HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK
-# FIXME: I don't think we need this 'hack' anymore
-# Dirty Hack:
-baddist=$(echo $DIST | grep -ic -e squeeze -e wheezy || true)
-if [ $baddist -eq 1 ]
-then
-    sed -i 's/ libbabeltrace-ctf-dev, libbabeltrace-dev,//g' ceph_${vers}-1.dsc || true
-    sed -i 's/ liblttng-ust-dev//g' ceph_${vers}-1.dsc || true
-
-fi
-# HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK
-
-
-# unpack sources
-dpkg-source -x ceph_${vers}-1.dsc
-
-
-# HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK
-if [ $baddist -eq 1 ]
-then
-    rm -vf *.orig.tar.gz || true
-    grep -v babeltrace ceph-${vers}/debian/control  | grep -v liblttng > ceph-${vers}/debian/control.new
-    mv -v ceph-${vers}/debian/control.new ceph-${vers}/debian/control
-fi
-# HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK
-
-
-(  cd ceph-${vers}
-   DEB_VERSION=$(dpkg-parsechangelog | sed -rne 's,^Version: (.*),\1, p')
-   BP_VERSION=${DEB_VERSION}${BPTAG}
-   dch -D $DIST --force-distribution -b -v "$BP_VERSION" "$comment"
-)
-dpkg-source -b ceph-${vers}
-
-echo "Building Debian"
-cd "$WORKSPACE"
-# Before, at this point, this script called the below contents that
-# was part of /srv/ceph-buid/build_debs.sh. Now everything is in here, in one
-# place, no need to checkout/clone anything. WYSIWYG::
-#
-#    sudo $bindir/build_debs.sh ./release /srv/debian-base $vers
-
-
-releasedir="./release"
-pbuilddir="/srv/debian-base"
-cephver=$vers
-
-echo version $cephver
-
-# This used to live in a *file* on /src/ceph-build. Now it lives here because
-# it doesn't make sense to have a file that lives in /srv/ that we then
-# concatenate to get its contents.
-
-dvers=`cat $releasedir/$cephver/debian_version`
-echo deb vers $dvers
-
-# This function used to live as /srv/gen_debian_version.sh
-gen_debian_version() {
-    raw=$1
-    dist=$2
-
-    [ "$dist" = "sid" ] && dver="$raw"
-    [ "$dist" = "jessie" ] && dver="$raw~bpo80+1"
-    [ "$dist" = "wheezy" ] && dver="$raw~bpo70+1"
-    [ "$dist" = "squeeze" ] && dver="$raw~bpo60+1"
-    [ "$dist" = "lenny" ] && dver="$raw~bpo50+1"
-    [ "$dist" = "precise" ] && dver="$raw$dist"
-    [ "$dist" = "saucy" ] && dver="$raw$dist"
-    [ "$dist" = "trusty" ] && dver="$raw$dist"
-    [ "$dist" = "xenial" ] && dver="$raw$dist"
-
-    echo $dver
-}
-
-# FIXME this looks exactly like `setup_pbuilder`, we probably don't need this
-# or we need to refactor.
-sudo pbuilder --clean
-
-bpvers=`gen_debian_version $dvers $DIST`
-echo deb vers $bpvers
-
-
-echo building debs for $DIST
-if [ `dpkg-architecture -qDEB_BUILD_ARCH` = "i386" ] ; then
-    #  Architecture dependent, independent and source
-    sudo pbuilder build \
-        --distribution $DIST \
-        --basetgz $pbuilddir/$DIST.tgz \
-        --buildresult $releasedir/$cephver \
-        --debbuildopts "-j`grep -c processor /proc/cpuinfo`" \
-        $releasedir/$cephver/ceph_$bpvers.dsc
-else
-    #  Binary only architecture dependent
-    sudo pbuilder build \
-        --binary-arch \
-        --distribution $DIST \
-        --basetgz $pbuilddir/$DIST.tgz \
-        --buildresult $releasedir/$cephver \
-        --debbuildopts "-j`grep -c processor /proc/cpuinfo`" \
-        $releasedir/$cephver/ceph_$bpvers.dsc
-fi
-
-# do lintian checks
-bpvers=`gen_debian_version $dvers $DIST`
-echo lintian checks for $bpvers
-echo lintian --allow-root $releasedir/$cephver/*$bpvers*.deb
-
-[ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags=""
-
-# push binaries to chacra
-find release/$vers/ | egrep "*\.(changes|deb|dsc|gz)$" | egrep -v "(Packages|Sources|Contents)" | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}
diff --git a/ceph-build-arm64/build/build_rpm b/ceph-build-arm64/build/build_rpm
deleted file mode 100644 (file)
index 928ed05..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-set -ex
-
-if [[ ! -f /etc/redhat-release && ! -f /usr/bin/zypper ]] ; then
-    exit 0
-fi
-
-VENV="$WORKSPACE/venv/bin"
-
-get_rpm_dist() {
-    LSB_RELEASE=/usr/bin/lsb_release
-    [ ! -x $LSB_RELEASE ] && echo unknown && exit
-
-    ID=`$LSB_RELEASE --short --id`
-
-    case $ID in
-    RedHatEnterpriseServer)
-        RELEASE=`$LSB_RELEASE --short --release | cut -d. -f1`
-        DIST=rhel$RELEASE
-        DISTRO=rhel
-        ;;
-    CentOS)
-        RELEASE=`$LSB_RELEASE --short --release | cut -d. -f1`
-        DIST=el$RELEASE
-        DISTRO=centos
-        ;;
-    Fedora)
-        RELEASE=`$LSB_RELEASE --short --release`
-        DIST=fc$RELEASE
-        DISTRO=fedora
-        ;;
-    SUSE\ LINUX)
-        DESC=`$LSB_RELEASE --short --description`
-        RELEASE=`$LSB_RELEASE --short --release`
-        case $DESC in
-        *openSUSE*)
-                DIST=opensuse$RELEASE
-                DISTRO=opensuse
-            ;;
-        *Enterprise*)
-                DIST=sles$RELEASE
-                DISTRO=sles
-                ;;
-            esac
-        ;;
-    *)
-        DIST=unknown
-        DISTRO=unknown
-        ;;
-    esac
-
-    echo $DIST
-}
-
-get_rpm_dist
-dist=$DIST
-[ -z "$dist" ] && echo no dist && exit 1
-echo dist $dist
-
-vers=`cat ./dist/version`
-# slap -rc to the ref if we are doing a release-candidate build
-[ "$RC" = true ] && chacra_ref="$BRANCH-rc" || chacra_ref="$BRANCH"
-[ "$TEST" = true ] && chacra_ref="test"
-chacra_baseurl="ceph/${chacra_ref}/${DISTRO}/${RELEASE}"
-
-# this exists in scripts/build_utils.sh
-check_binary_existence $chacra_baseurl/$ARCH
-
-HOST=$(hostname --short)
-echo "Building on $(hostname)"
-echo "  DIST=${DIST}"
-echo "  BPTAG=${BPTAG}"
-echo "  WS=$WORKSPACE"
-echo "  PWD=$(pwd)"
-echo "  BUILD SOURCE=$COPYARTIFACT_BUILD_NUMBER_CEPH_SETUP"
-echo "*****"
-env
-echo "*****"
-
-
-# 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
-
-echo "Building RPMs"
-
-# The below contents ported from /srv/ceph-build/build_rpms.sh ::
-#     $bindir/build_rpms.sh ./release $vers
-#
-
-releasedir="./release"
-cephver=$vers
-
-cd $releasedir/$cephver || exit 1
-
-# Set up build area
-BUILDAREA=./rpm/$dist
-mkdir -p ${BUILDAREA}/{SOURCES,SRPMS,SPECS,RPMS,BUILD}
-cp -a ceph-*.tar.bz2 ${BUILDAREA}/SOURCES/.
-cp -a ceph.spec ${BUILDAREA}/SPECS/.
-cp -a rpm/*.patch ${BUILDAREA}/SOURCES/. || true
-
-# Build RPMs
-BUILDAREA=`readlink -fn ${BUILDAREA}`   ### rpm wants absolute path
-cd ${BUILDAREA}/SPECS
-rpmbuild -ba --define "_topdir ${BUILDAREA}" ceph.spec
-
-echo done
-
-# Make sure we execute at the top level directory
-cd "$WORKSPACE"
-
-[ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags=""
-
-# push binaries to chacra
-find release/${vers}/rpm/*/SRPMS | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_baseurl}/source
-find release/${vers}/rpm/*/RPMS/* | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_baseurl}/${ARCH}
diff --git a/ceph-build-arm64/build/setup b/ceph-build-arm64/build/setup
deleted file mode 100644 (file)
index 388252b..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-#
-# Ceph distributed storage system
-#
-# Copyright (C) 2014 Red Hat <contact@redhat.com>
-#
-# Author: Loic Dachary <loic@dachary.org>
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License, or (at your option) any later version.
-#
-set -ex
-HOST=$(hostname --short)
-echo "Building on $(hostname)"
-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 "*****"
-
-DIR=/tmp/install-deps.$$
-trap "rm -fr $DIR" EXIT
-mkdir -p $DIR
-if test $(id -u) != 0 ; then
-    SUDO=sudo
-fi
-export LC_ALL=C # the following is vulnerable to i18n
-
-if test -f /etc/redhat-release ; then
-    $SUDO yum install -y redhat-lsb-core
-fi
-
-if which apt-get > /dev/null ; then
-    $SUDO apt-get install -y lsb-release
-fi
-
-# unpack the tar.gz that contains the debian dir
-cd dist
-tar xzf *.orig.tar.gz
-cd ceph-*
-pwd
-
-
-
-case $(lsb_release -si) in
-CentOS|Fedora|SUSE*|RedHatEnterpriseServer)
-        case $(lsb_release -si) in
-            SUSE*)
-                $SUDO zypper -y yum-utils
-                ;;
-            *)
-                $SUDO yum install -y yum-utils
-                ;;
-        esac
-        sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
-        $SUDO yum-builddep -y $DIR/ceph.spec
-        ;;
-*)
-        echo "$(lsb_release -si) is unknown, dependencies will have to be installed manually."
-        ;;
-esac
-
-pkgs=( "chacractl>=0.0.4" )
-install_python_packages "pkgs[@]"
-
-# create the .chacractl config file using global variables
-make_chacractl_config
diff --git a/ceph-build-arm64/build/setup_pbuilder b/ceph-build-arm64/build/setup_pbuilder
deleted file mode 100755 (executable)
index d998575..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh -x
-# This file will set the tgz images needed for pbuilder on a given host. It has
-# some hard-coded values like `/srv/debian-base` because it gets built every
-# time this file is executed - completely ephemeral.  If a Debian host will use
-# pbuilder, then it will need this. Since it is not idempotent it makes
-# everything a bit slower. ## FIXME ##
-
-set -e
-
-# Only run when we are a Debian or Debian-based distro
-if test -f /etc/redhat-release ; then
-    exit 0
-fi
-
-basedir="/srv/debian-base"
-
-# Ensure that the basedir directory exists
-sudo mkdir -p "$basedir"
-
-# This used to live in a *file* on /srv/ceph-build as
-# /srv/ceph-build/update_pbuilder.sh Now it lives here because it doesn't make
-# sense to have a file that lives in /srv/ that we then concatenate to get its
-# contents.  what.
-# By using $DIST we are narrowing down to updating only the distro image we
-# need, unlike before where we updated everything on every server on every
-# build.
-
-os="debian"
-[ "$DIST" = "precise" ] && os="ubuntu"
-[ "$DIST" = "saucy" ] && os="ubuntu"
-[ "$DIST" = "trusty" ] && os="ubuntu"
-[ "$DIST" = "xenial" ] && os="ubuntu"
-
-if [ $os = "debian" ]; then
-    mirror="http://www.gtlib.gatech.edu/pub/debian"
-elif [ "$ARCH" = "arm64" ]; then
-    mirror="http://ports.ubuntu.com/ubuntu-ports"
-else
-    mirror="http://us.archive.ubuntu.com/ubuntu"
-fi
-
-# ensure that the tgz is valid, otherwise remove it so that it can be recreated
-# again
-pbuild_tar="$basedir/$DIST.tgz"
-is_not_tar=`python -c "exec 'try: import tarfile;print int(not int(tarfile.is_tarfile(\"$pbuild_tar\")))\nexcept IOError: print 1'"`
-file_size_kb=`du -k "$pbuild_tar" | cut -f1`
-
-if $is_not_tar; then
-    sudo rm -f "$pbuild_tar"
-fi
-
-if [ $file_size_kb -lt 1 ]; then
-    sudo rm -f "$pbuild_tar"
-fi
-
-# Ordinarily pbuilder only pulls packages from "main".  ceph depends on
-# packages like python-virtualenv which are in "universe". We have to configure
-# pbuilder to look in "universe". Otherwise the build would fail with a message similar
-# to:
-#    The following packages have unmet dependencies:
-#      pbuilder-satisfydepends-dummy : Depends: python-virtualenv which is a virtual package.
-#                                      Depends: xmlstarlet which is a virtual package.
-#     Unable to resolve dependencies!  Giving up...
-echo 'COMPONENTS="main universe"' > ~/.pbuilderrc
-
-sudo pbuilder --clean
-
-if [ -e $basedir/$DIST.tgz ]; then
-    echo updating $DIST base.tgz
-    sudo pbuilder update \
-    --basetgz $basedir/$DIST.tgz \
-    --distribution $DIST \
-    --mirror "$mirror"
-else
-    echo building $DIST base.tgz
-    sudo pbuilder create \
-    --basetgz $basedir/$DIST.tgz \
-    --distribution $DIST \
-    --mirror "$mirror"
-fi
diff --git a/ceph-build-arm64/config/definitions/ceph-build-arm64.yml b/ceph-build-arm64/config/definitions/ceph-build-arm64.yml
deleted file mode 100644 (file)
index c9c2b49..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-- job:
-    name: ceph-build-arm64
-    project-type: matrix
-    disabled: true
-    defaults: global
-    display-name: 'ceph-build-arm64'
-    block-downstream: false
-    block-upstream: false
-    properties:
-      - github:
-          url: https://github.com/ceph/ceph
-    parameters:
-      - string:
-          name: BRANCH
-          description: Branch used by ceph-setup-arm64
-    execution-strategy:
-      combination-filter: (DIST == "xenial" && ARCH == "arm64")
-    axes:
-      - axis:
-          type: label-expression
-          name: ARCH
-          values:
-            - arm64
-      - axis:
-          type: label-expression
-          name: DIST
-          values:
-            - xenial
-
-    builders:
-      - shell: |
-          echo "Cleaning up top-level workarea (shared among workspaces)"
-          rm -rf dist
-          rm -rf venv
-          rm -rf release
-      - copyartifact:
-          project: ceph-setup-arm64
-          filter: 'dist/**'
-          which-build: build-param
-          param: 'BRANCH'
-      # general setup
-      - shell:
-          !include-raw:
-            - ../../../scripts/build_utils.sh
-            - ../../build/setup
-      # debian build scripts
-      - shell:
-          !include-raw:
-            - ../../../scripts/build_utils.sh
-            - ../../build/setup_pbuilder
-            - ../../build/build_deb
-      # rpm build scripts
-      - shell:
-          !include-raw:
-            - ../../../scripts/build_utils.sh
-            - ../../build/build_rpm
-
-    wrappers:
-      - inject-passwords:
-          global: true
-          mask-password-params: true
index 3a9f8b1b829c091a05573920a7716f7133dd9202..73820b5cda48a409cf5372e3ad1f9bac545fb154 100644 (file)
@@ -9,7 +9,7 @@
       - github:
           url: https://github.com/ceph/ceph
     execution-strategy:
-      combination-filter: (ARCH=="x86_64") || (DIST == "trusty" && ARCH == "arm64")
+      combination-filter: (ARCH=="x86_64") || (DIST == "xenial" && ARCH == "arm64")
     axes:
       - axis:
           type: label-expression
@@ -21,6 +21,7 @@
           name: ARCH
           values:
             - x86_64
+            - arm64
       - axis:
           type: label-expression
           name: DIST
@@ -29,6 +30,7 @@
             #- wheezy
             #- precise
             - trusty
+            - xenial
             #- centos6
             - centos7
 
             - ../../../scripts/build_utils.sh
             - ../../build/build_rpm
 
-    publishers:
-      - archive:
-          artifacts: 'dist/**'
-          allow-empty: false
-          latest-only: false
-
     wrappers:
       - inject-passwords:
           global: true
diff --git a/ceph-setup-arm64/build/build b/ceph-setup-arm64/build/build
deleted file mode 100644 (file)
index fb0c3b6..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/bash -ex
-
-HOST=$(hostname --short)
-echo "Building on ${HOST}"
-echo "  DIST=${DIST}"
-echo "  BPTAG=${BPTAG}"
-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"
-
-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.80/' 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
-
-# because autogen+configure will check for dependencies, we are forced to install them
-# and ensure they are present in the current host
-if [ -x install-deps.sh ]; then
-  echo "Ensuring dependencies are installed"
-  ./install-deps.sh
-fi
-
-# run submodule updates regardless
-echo "Running submodule update ..."
-git submodule update --init
-
-echo "Running autogen.sh ..."
-./autogen.sh
-echo "Running configure ..."
-./configure \
-  --disable-option-checking \
-  '--prefix=/usr' \
-  '--sbindir=/sbin' \
-  '--localstatedir=/var' \
-  '--sysconfdir=/etc' \
-  '--with-debug' \
-  '--with-nss' \
-  '--with-radosgw' \
-  '--disable-static' \
-  '--without-lttng' \
-  'CFLAGS= -Wno-unused-parameter' \
-  'CXXFLAGS=  -Wno-unused-parameter' \
-  --cache-file=/dev/null \
-  --srcdir=.
-
-mkdir -p release
-
-# Contents below used to come from /srv/release_tarball.sh and
-# was called like::
-#
-#    $bindir/release_tarball.sh release release/version
-
-releasedir='release'
-versionfile='release/version'
-
-if git diff --quiet ; then
-    echo repository is clean
-else
-    echo
-    echo "**** REPOSITORY IS DIRTY ****"
-    echo
-    if [ "$force" != "force" ]; then
-       echo "add 'force' argument if you really want to continue."
-       exit 1
-    fi
-    echo "forcing."
-fi
-
-cephver=`git describe --match "v*" | sed s/^v//`
-echo current version $cephver
-
-srcdir=`pwd`
-
-    echo building tarball
-    rm ceph-*.tar.gz || true
-    rm ceph-*.tar.bz2 || true
-    make dist
-    make dist-bzip2
-
-    vers=`ls ceph-*.tar.gz | cut -c 6- | sed 's/.tar.gz//'`
-    echo tarball vers $vers
-
-    echo extracting
-    mkdir -p $releasedir/$vers/rpm
-    cp rpm/*.patch $releasedir/$vers/rpm || true
-    cd $releasedir/$vers
-
-    tar zxf $srcdir/ceph-$vers.tar.gz
-
-    tar zcf ceph_$vers.orig.tar.gz ceph-$vers
-    cp -a ceph_$vers.orig.tar.gz ceph-$vers.tar.gz
-
-    tar jcf ceph-$vers.tar.bz2 ceph-$vers
-
-    # copy debian dir, too
-    cp -a $srcdir/debian debian
-    cd $srcdir
-
-    # copy in spec file, too
-    cp ceph.spec $releasedir/$vers
-
-if [ -n "$versionfile" ]; then
-    echo $vers > $versionfile
-    echo "wrote $vers to $versionfile"
-fi
-
-(
-    cd release/$vers
-    mv debian ceph-$vers/.
-    dpkg-source -b ceph-$vers
-)
-
-mkdir -p dist
-# Debian Source Files
-mv release/$vers/*.dsc dist/.
-mv release/$vers/*.diff.gz dist/.
-mv release/$vers/*.orig.tar.gz dist/.
-# RPM Source Files
-mkdir -p dist/rpm/
-mv release/$vers/rpm/*.patch dist/rpm/ || true
-mv release/$vers/ceph.spec dist/.
-mv release/$vers/*.tar.* dist/.
-# Parameters
-mv release/version dist/.
diff --git a/ceph-setup-arm64/config/definitions/ceph-setup.yml b/ceph-setup-arm64/config/definitions/ceph-setup.yml
deleted file mode 100644 (file)
index 8bcc6c3..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: ceph-setup-arm64
-    description: "This job step checks out the branch and builds the tarballs, diffs, and dsc that are passed to the ceph-build step.\r\n\r\nNotes:\r\nJob needs to run on a releatively recent debian system.  The Restrict where run feature is used to specifiy an appropriate label.\r\nThe clear workspace before checkout box for the git plugin is used."
-    # we do not need to pin this to trusty anymore for the new jenkins instance
-    # FIXME: unpin when this gets ported over
-    node: xenial
-    display-name: 'ceph-setup-arm64'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-    block-downstream: false
-    block-upstream: false
-    properties:
-      - github:
-          url: https://github.com/ceph/ceph
-
-    parameters:
-      - string:
-          name: BRANCH
-          description: "The git branch (or tag) to build"
-
-    scm:
-      - git:
-          url: git@github.com:ceph/ceph.git
-          # Use the SSH key attached to the ceph-jenkins GitHub account.
-          credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d'
-          branches:
-            - $BRANCH
-          skip-tag: true
-          wipe-workspace: true
-
-    builders:
-      - shell:
-          !include-raw ../../build/build
-
-    publishers:
-      - archive:
-          artifacts: 'dist/**'
-          allow-empty: false
-          latest-only: false
-
-    wrappers:
-      - inject-passwords:
-          global: true
-          mask-password-params: true
-      - ssh-agent-credentials:
-          # "jenkins-build" SSH key, needed for access to ceph-releases.git
-          users:
-            - '39fa150b-b2a1-416e-b334-29a9a2c0b32d'