Merge "ci: Remove variable set by jjb scripts"

diff --git a/ci/utility/package-list.sh b/ci/utility/package-list.sh
index 9f87843..d96fffb 100755 (executable)
--- a/ci/utility/package-list.sh
+++ b/ci/utility/package-list.sh
@@ -13,16 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-WORKSPACE=${WORKSPACE:-`cd && pwd`}
+RPM_WORKDIR=$WORKSPACE/rpmbuild
+RPM_DIR=$RPM_WORKDIR/RPMS/x86_64
 
 COLLECTD_DIR=$WORKSPACE/collectd
 CMTCAT_DIR=$WORKSPACE/intel-cmt-cat
-RPM_WORKDIR=$WORKSPACE/rpmbuild
 
 CMTCAT_REPO=https://github.com/01org/intel-cmt-cat.git
 CMTCAT_BRANCH=master
 COLLECTD_REPO=https://github.com/collectd/collectd.git
 COLLECTD_BRANCH=master
-
-# Here rpms built could be taken from
-RPM_DIR=$RPM_WORKDIR/RPMS/x86_64/