[ARVADOS] created: e821b673b8290ab848b0a071abf6c389f3f906ec
Git user
git at public.curoverse.com
Wed Dec 28 18:15:23 EST 2016
at e821b673b8290ab848b0a071abf6c389f3f906ec (commit)
commit e821b673b8290ab848b0a071abf6c389f3f906ec
Author: Ward Vandewege <ward at curoverse.com>
Date: Wed Dec 28 18:14:56 2016 -0500
Remove debian7 from the build directory.
refs #10785
diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 18694ed..624d5f2 100644
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -1,4 +1,4 @@
-all: centos6/generated centos7/generated debian7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated
+all: centos6/generated centos7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated
centos6/generated: common-generated-all
test -d centos6/generated || mkdir centos6/generated
@@ -8,10 +8,6 @@ centos7/generated: common-generated-all
test -d centos7/generated || mkdir centos7/generated
cp -rlt centos7/generated common-generated/*
-debian7/generated: common-generated-all
- test -d debian7/generated || mkdir debian7/generated
- cp -rlt debian7/generated common-generated/*
-
debian8/generated: common-generated-all
test -d debian8/generated || mkdir debian8/generated
cp -rlt debian8/generated common-generated/*
diff --git a/build/package-build-dockerfiles/debian7/Dockerfile b/build/package-build-dockerfiles/debian7/Dockerfile
deleted file mode 100644
index 7632c94..0000000
--- a/build/package-build-dockerfiles/debian7/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM debian:wheezy
-MAINTAINER Ward Vandewege <ward at curoverse.com>
-
-# Install dependencies and set up system.
-RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libpq-dev python-pip unzip
-
-# Install RVM
-RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
- curl -L https://get.rvm.io | bash -s stable && \
- /usr/local/rvm/bin/rvm install 2.1 && \
- /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
- /usr/local/rvm/bin/rvm-exec default gem install bundler && \
- /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
-
-# Install golang binary
-ADD generated/go1.7.1.linux-amd64.tar.gz /usr/local/
-RUN ln -s /usr/local/go/bin/go /usr/local/bin/
-
-ENV WORKSPACE /arvados
-CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "debian7"]
diff --git a/build/package-test-dockerfiles/debian7/Dockerfile b/build/package-test-dockerfiles/debian7/Dockerfile
deleted file mode 100644
index c9a2fdc..0000000
--- a/build/package-test-dockerfiles/debian7/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM debian:7
-MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
-
-# Install RVM
-RUN apt-get update && apt-get -y install curl procps && \
- gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
- curl -L https://get.rvm.io | bash -s stable && \
- /usr/local/rvm/bin/rvm install 2.1 && \
- /usr/local/rvm/bin/rvm alias create default ruby-2.1
-
-# udev daemon can't start in a container, so don't try.
-RUN mkdir -p /etc/udev/disabled
-
-RUN echo "deb file:///arvados/packages/debian7/ /" >>/etc/apt/sources.list
diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index 16c7129..7c43381 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -7,7 +7,7 @@ Syntax:
WORKSPACE=/path/to/arvados $(basename $0) [options]
--target <target>
- Distribution to build packages for (default: debian7)
+ Distribution to build packages for (default: debian8)
--command
Build command to execute (default: use built-in Docker image command)
--test-packages
@@ -48,7 +48,7 @@ if [ $? -ne 0 ]; then
exit 1
fi
-TARGET=debian7
+TARGET=debian8
COMMAND=
DEBUG=
diff --git a/build/run-build-packages-sso.sh b/build/run-build-packages-sso.sh
index b5dcdfc..c8b2529 100755
--- a/build/run-build-packages-sso.sh
+++ b/build/run-build-packages-sso.sh
@@ -14,7 +14,7 @@ Options:
--debug
Output debug information (default: false)
--target
- Distribution to build packages for (default: debian7)
+ Distribution to build packages for (default: debian8)
WORKSPACE=path Path to the Arvados SSO source tree to build packages from
@@ -22,7 +22,7 @@ EOF
EXITCODE=0
DEBUG=${ARVADOS_DEBUG:-0}
-TARGET=debian7
+TARGET=debian8
PARSEDOPTS=$(getopt --name "$0" --longoptions \
help,build-bundle-packages,debug,target: \
@@ -68,9 +68,6 @@ if [[ "$DEBUG" != 0 ]]; then
fi
case "$TARGET" in
- debian7)
- FORMAT=deb
- ;;
debian8)
FORMAT=deb
;;
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 08b7e21..db93a6e 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -16,7 +16,7 @@ Options:
--debug
Output debug information (default: false)
--target <target>
- Distribution to build packages for (default: debian7)
+ Distribution to build packages for (default: debian8)
--only-build <package>
Build only a specific package (or $ONLY_BUILD from environment)
--command
@@ -29,7 +29,7 @@ EOF
EXITCODE=0
DEBUG=${ARVADOS_DEBUG:-0}
-TARGET=debian7
+TARGET=debian8
COMMAND=
PARSEDOPTS=$(getopt --name "$0" --longoptions \
@@ -101,17 +101,6 @@ PYTHON3_INSTALL_LIB=lib/python$PYTHON3_VERSION/dist-packages
## End Debian Python defaults.
case "$TARGET" in
- debian7)
- FORMAT=deb
- PYTHON_BACKPORTS=(python-gflags==2.0 google-api-python-client==1.4.2 \
- oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
- rsa uritemplate httplib2 ws4py pykka six \
- ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
- 'pycurl<7.21.5' contextlib2 pyyaml 'rdflib>=4.2.0' \
- shellescape mistune typing avro ruamel.ordereddict
- cachecontrol requests 'pathlib2>=2.1.0')
- PYTHON3_BACKPORTS=(docker-py==1.7.2 six requests websocket-client==0.37.0)
- ;;
debian8)
FORMAT=deb
PYTHON_BACKPORTS=(python-gflags==2.0 google-api-python-client==1.4.2 \
diff --git a/build/run-build-test-packages-one-target.sh b/build/run-build-test-packages-one-target.sh
index ff6bad4..46b8133 100755
--- a/build/run-build-test-packages-one-target.sh
+++ b/build/run-build-test-packages-one-target.sh
@@ -7,7 +7,7 @@ Syntax:
WORKSPACE=/path/to/arvados $(basename $0) [options]
--target <target>
- Distribution to build packages for (default: debian7)
+ Distribution to build packages for (default: debian8)
--upload
If the build and test steps are successful, upload the packages
to a remote apt repository (default: false)
@@ -39,7 +39,7 @@ if [ $? -ne 0 ]; then
exit 1
fi
-TARGET=debian7
+TARGET=debian8
UPLOAD=0
eval set -- "$PARSEDOPTS"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list