From: Roni Riska <roni.riska@nokia.com>
Date: Mon, 9 Sep 2019 13:13:25 +0000 (+0300)
Subject: Drop opentracing build
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=2ab92e9426a02446589b6cdcbda6776c02a0a970;p=ric-plt%2Ftracelibcpp.git

Drop opentracing build

The CI Dockerfile does not compile opentracing packages
anymore because it really does not belong to this
repository.

Change-Id: I81fef556e73d4abbe16eea3d457fc9dfdde3efd5
Signed-off-by: Roni Riska <roni.riska@nokia.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e44fb55..c1198c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
 set (tracelibcpp_VERSION_MAJOR "0")
 set (tracelibcpp_VERSION_MINOR "0")
-set (tracelibcpp_VERSION_MICRO "4")
+set (tracelibcpp_VERSION_MICRO "5")
 set (tracelibcpp_VERSION_STRING
     "${tracelibcpp_VERSION_MAJOR}.${tracelibcpp_VERSION_MINOR}.${tracelibcpp_VERSION_MICRO}")
 
diff --git a/README.md b/README.md
index 4f44ce3..a83f708 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@ By default a no-op tracer is created.
 
 cmake
 gcc/c++
+opentracing-cpp version 1.5.0
 
 ## Build
 mkdir build
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 3a10250..4827d42 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -23,13 +23,10 @@ FROM buildpack-deps:stretch
 RUN apt-get update && apt-get -q -y install \
   cmake \
   rpm \
-  rename \
-  alien
+  rename
 
 RUN mkdir -p /tmp/build
 COPY . /tmp/build
 RUN cd /tmp/build && ci/ci_build.sh
 
-RUN cd /tmp/build && ci/build_opentracing.sh
-
 ENTRYPOINT ["/tmp/build/ci/publish.sh"]
diff --git a/ci/build_opentracing.sh b/ci/build_opentracing.sh
deleted file mode 100755
index b2a5753..0000000
--- a/ci/build_opentracing.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2019 AT&T Intellectual Property.
-# Copyright (c) 2018-2019 Nokia.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-set -e
-
-REL=1.5.0
-
-wget https://github.com/opentracing/opentracing-cpp/archive/v$REL.tar.gz -O opentracing-cpp-$REL.tar.gz
-tar zxf opentracing-cpp-$REL.tar.gz
-cd opentracing-cpp-$REL
-
-cmake .
-make package
-cpack -G RPM -D CPACK_RPM_FILE_NAME=RPM-DEFAULT
-alien opentracing-cpp-$REL-1.x86_64.rpm --keep-version
-mv *.rpm *.deb ..