Merge pull request #41 from Fiware/develop

Change project keys
telefonicaid · Jan 30, 2015 · 362d6a1 · 362d6a1
2 parents c9ae859 + 67cb22d
commit 362d6a1
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 555 deletions.
diff --git a/ngsi_adapter/script/build/files/debian/changelog b/ngsi_adapter/script/build/files/debian/changelog
@@ -2,7 +2,7 @@ fiware-monitoring-ngsi-adapter (1.2.1) precise; urgency=low
 
   * Minor bugs resolved
 
- -- Telefónica I+D <opensource@tid.es>  Mon, 12 Jan 2015 18:30:00 +0200
+ -- Telefónica I+D <opensource@tid.es>  Fri, 30 Jan 2015 15:00:00 +0200
 
 fiware-monitoring-ngsi-adapter (1.2.0) precise; urgency=low
 

diff --git a/ngsi_adapter/script/build/files/jenkins/fiware-monitoring-ngsi-adapter-build.xml b/ngsi_adapter/script/build/files/jenkins/fiware-monitoring-ngsi-adapter-build.xml
diff --git a/ngsi_adapter/script/build/files/jenkins/fiware-monitoring-ngsi-adapter-deploy-deb.xml b/ngsi_adapter/script/build/files/jenkins/fiware-monitoring-ngsi-adapter-deploy-deb.xml
diff --git a/ngsi_adapter/script/build/jenkins.sh b/ngsi_adapter/script/build/jenkins.sh
@@ -92,8 +92,8 @@ PRODUCT_NAME=$(echo "$PRODUCT_INFO" | sed -n '/"name"/ {s/.*:.*"\(.*\)".*/\1/; p
 PRODUCT_RELEASE=$(echo "$PRODUCT_INFO" | sed -n '/"release"/ {s/.*:.*"\(.*\)".*/\1/; p; q}')
 PROJECT_NAME=$(sed -n '/"name"/ {s/.*:.*"\(.*\)".*/\1/; p; q}' $PROJECT_BASE_DIR/package.json)
 PROJECT_VERSION=$(sed -n '/"version"/ {s/.*:.*"\(.*\)".*/\1/; p; q}' $PROJECT_BASE_DIR/package.json)
-SONAR_PROJECT_NAME=$(echo "$PRODUCT_NAME-$PROJECT_NAME" | tr '_' '-')
-SONAR_PROJECT_KEY=com.telefonica.fiware:$SONAR_PROJECT_NAME
+SONAR_PROJECT_NAME="Monitoring NGSI Adapter"
+SONAR_PROJECT_KEY=com.telefonica.iot:monitoring-ngsi-adapter
 
 # Change to project directory
 cd $PROJECT_BASE_DIR
@@ -140,7 +140,7 @@ build)
 	chmod a+x ./metrics_runner.sh
 
 	# Generate metrics in SonarQube
-	export DEBUG_METRICS="FALSE"
+	export DEBUG_METRICS=FALSE
 	./metrics_runner.sh
 	;;
 

diff --git a/ngsi_adapter/script/build/release.sh b/ngsi_adapter/script/build/release.sh
@@ -75,15 +75,15 @@ create_debian_package() {
 get_linux_distro() {
 	local retvar=${1:-OS_DISTRO}
 	local distro
-	if [ -r /etc/lsb-release -a -r /etc/issue.net ]; then
+	if [ -r /etc/redhat-release ]; then
+		# RedHat/CentOS/Fedora
+		distro=$(cat /etc/redhat-release)
+	elif [ -r /etc/lsb-release -a -r /etc/issue.net ]; then
 		# Ubuntu
 		distro=$(cat /etc/issue.net)
 	elif [ -r /etc/debian_version -a -r /etc/issue.net ]; then
 		# Debian
 		distro=$(cat /etc/issue.net)
-	elif [ -r /etc/redhat-release ]; then
-		# RedHat/CentOS/Fedora
-		distro=$(cat /etc/redhat-release)
 	fi
 	[ -z "$distro" ] && return 1
 	eval $retvar=\"$distro\"

diff --git a/ngsi_event_broker/script/build/files/debian/changelog b/ngsi_event_broker/script/build/files/debian/changelog
@@ -1,3 +1,9 @@
+fiware-monitoring-ngsi-event-broker (1.4.1) precise; urgency=low
+
+  * Minor bugs resolved
+
+ -- Telefónica I+D <opensource@tid.es>  Fri, 30 Jan 2015 15:00:00 +0200
+
 fiware-monitoring-ngsi-event-broker (1.4.0) precise; urgency=low
 
   * Included new log format (issue #25)