From 2150e07da430f4b9c5f24eb7295c25febefafa6a Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 29 Apr 2014 12:11:32 -0500 Subject: [PATCH] Jenkins fixes Remove aps_build script, no longer used. Deleted GTEST variable from RELEASE.local, not used. --- jenkins/aps_build | 28 ---------------------------- jenkins/cloudbees_build | 1 - 2 files changed, 29 deletions(-) delete mode 100644 jenkins/aps_build diff --git a/jenkins/aps_build b/jenkins/aps_build deleted file mode 100644 index 5afb392..0000000 --- a/jenkins/aps_build +++ /dev/null @@ -1,28 +0,0 @@ -# pvAccess C++ implementation -# Jenkins @ APS build script -# -# Jenkins invokes scripts with the "-ex" option. So the build is considered a failure -# if any of the commands exits with a non-zero exit code. -# -# Authors: Ralph Lange and Andrew Johnson -# Copyright (C) 2013 Helmholtz-Zentrum Berlin für Materialien und Energie GmbH -# All rights reserved. Use is subject to license terms. - -########################################### -# Build - -export EPICS_BASE=${HOME}/jobs/epics-base-3.14/workspace -export EPICS_HOST_ARCH=$(${EPICS_BASE}/startup/EpicsHostArch) - -cat > configure/RELEASE.local << EOF -PVDATA=${HOME}/jobs/epics-pvData/workspace -PVCOMMON=${HOME}/jobs/epics-pvCommon/workspace -EPICS_BASE=${EPICS_BASE} -EOF - -make - -########################################### -# Test - -# Currently tests use GoogleTest, which I don't build diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build index d3256ff..994146e 100644 --- a/jenkins/cloudbees_build +++ b/jenkins/cloudbees_build @@ -38,7 +38,6 @@ export PATH=${STUFF}/bin:${PATH} cat > configure/RELEASE.local << EOF EPICS_BASE=${EPICS_BASE} -GTEST=${STUFF}/gtest EOF make distclean all