Skip to content

Commit 5e2e68b

Browse files
authored
Revert "CPP-906 - Migrate Job-Creator build.yaml to Jenkins pipelines (datastax#30)"
This reverts commit 72cbc13.
1 parent 2728a72 commit 5e2e68b

File tree

6 files changed

+93
-1025
lines changed

6 files changed

+93
-1025
lines changed

.build.linux.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616
##
1717

18-
configure_testing_environment() {
18+
configure_environment() {
1919
if ! grep -lq "127.254.254.254" /etc/hosts; then
2020
printf "\n\n%s\n" "127.254.254.254 cpp-driver.hostname." | sudo tee -a /etc/hosts
2121
fi
@@ -33,7 +33,7 @@ install_libuv() {(
3333
[[ -d build ]] && rm -rf build
3434
mkdir build
3535

36-
if [ "${OS_DISTRO}" = "ubuntu" ]; then
36+
if [ "${OS_NAME}" = "ubuntu" ]; then
3737
./build_deb.sh ${LIBUV_VERSION}
3838
else
3939
./build_rpm.sh ${LIBUV_VERSION}
@@ -43,7 +43,7 @@ install_libuv() {(
4343
[[ -d packages ]] || mkdir packages
4444
find libuv-packaging/build -type f \( -name "*.deb" -o -name "*.rpm" \) -exec mv {} packages \;
4545

46-
if [ "${OS_DISTRO}" = "ubuntu" ]; then
46+
if [ "${OS_NAME}" = "ubuntu" ]; then
4747
sudo dpkg -i packages/libuv*.deb
4848
else
4949
sudo rpm -U --force packages/libuv*.rpm
@@ -66,7 +66,7 @@ install_driver() {(
6666
[[ -d build ]] && rm -rf build
6767
mkdir build
6868

69-
if [ "${OS_DISTRO}" = "ubuntu" ]; then
69+
if [ "${OS_NAME}" = "ubuntu" ]; then
7070
./build_deb.sh
7171
else
7272
./build_rpm.sh
@@ -76,7 +76,7 @@ install_driver() {(
7676
[[ -d packages ]] || mkdir packages
7777
find build -type f \( -name "*.deb" -o -name "*.rpm" \) -exec mv {} packages \;
7878

79-
if [ "${OS_DISTRO}" = "ubuntu" ]; then
79+
if [ "${OS_NAME}" = "ubuntu" ]; then
8080
sudo dpkg -i packages/*cpp-driver*.deb
8181
else
8282
sudo rpm -i packages/*cpp-driver*.rpm

.build.osx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616
##
1717

18-
configure_testing_environment() {
18+
configure_environment() {
1919
true
2020
}
2121

.build.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,13 @@
2020
#set -n #Check Syntax
2121
set -e #Fail fast on non-zero exit status
2222

23-
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
23+
WORKER_INFORMATION=($(echo ${OS_VERSION} | tr "/" " "))
24+
OS_NAME=${WORKER_INFORMATION[0]}
25+
RELEASE=${WORKER_INFORMATION[1]}
26+
SHA=$(echo ${GIT_COMMIT} | cut -c1-7)
2427

25-
if [ "${OS_DISTRO}" = "osx" ]; then
28+
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
29+
if [ "${OS_NAME}" = "osx" ]; then
2630
LIB_SUFFIX="dylib"
2731
PROCS=$(sysctl -n hw.logicalcpu)
2832
. ${SCRIPT_DIR}/.build.osx.sh

0 commit comments

Comments
 (0)