From 259bdc461af4f170d446f669b521aa0787235300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Rodr=C3=ADguez?= Date: Thu, 29 Jan 2015 12:23:21 +0000 Subject: [PATCH 1/2] Change project keys --- ngsi_adapter/script/build/jenkins.sh | 2 +- ngsi_event_broker/script/build/jenkins.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ngsi_adapter/script/build/jenkins.sh b/ngsi_adapter/script/build/jenkins.sh index 4730f54..d8e01fb 100755 --- a/ngsi_adapter/script/build/jenkins.sh +++ b/ngsi_adapter/script/build/jenkins.sh @@ -93,7 +93,7 @@ PRODUCT_RELEASE=$(echo "$PRODUCT_INFO" | sed -n '/"release"/ {s/.*:.*"\(.*\)".*/ 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_KEY=com.telefonica.IoT:$SONAR_PROJECT_NAME # Change to project directory cd $PROJECT_BASE_DIR diff --git a/ngsi_event_broker/script/build/jenkins.sh b/ngsi_event_broker/script/build/jenkins.sh index f63ae8d..a9fb193 100755 --- a/ngsi_event_broker/script/build/jenkins.sh +++ b/ngsi_event_broker/script/build/jenkins.sh @@ -92,7 +92,7 @@ PRODUCT_RELEASE=$(sed -n '/\[PRODUCT_RELEASE\]/ {s/.*\[.*\].*\[\(.*\)\].*/\1/; p PROJECT_NAME=$(sed -n '/AC_INIT/ {s/.*\[PRODUCT_NAME-\(.*\)].*/\1/; p}' $PROJECT_DIR/configure.ac) PROJECT_VERSION=$(sed -n '/AC_INIT/ {s/.*,[ \t]*\(.*\))/\1/; p}' $PROJECT_DIR/configure.ac) SONAR_PROJECT_NAME=$(echo "$PRODUCT_NAME-$PROJECT_NAME" | tr '_' '-') -SONAR_PROJECT_KEY=com.telefonica.fiware:$SONAR_PROJECT_NAME +SONAR_PROJECT_KEY=com.telefonica.IoT:$SONAR_PROJECT_NAME # Dependencies RPM_DEPENDENCIES="wget gcc-c++ make autoconf automake libtool cppunit-devel libcurl-devel" From 67cb22d306b52c1fb3de3282db03c42e709344b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Rodr=C3=ADguez?= Date: Fri, 30 Jan 2015 13:11:32 +0000 Subject: [PATCH 2/2] Preparation for next release --- .../script/build/files/debian/changelog | 2 +- .../fiware-monitoring-ngsi-adapter-build.xml | 170 ----------------- ...are-monitoring-ngsi-adapter-deploy-deb.xml | 93 --------- ngsi_adapter/script/build/jenkins.sh | 6 +- ngsi_adapter/script/build/release.sh | 8 +- .../script/build/files/debian/changelog | 6 + ...are-monitoring-ngsi-event-broker-build.xml | 180 ------------------ ...onitoring-ngsi-event-broker-deploy-deb.xml | 97 ---------- ngsi_event_broker/script/build/jenkins.sh | 6 +- ngsi_event_broker/script/build/release.sh | 8 +- 10 files changed, 21 insertions(+), 555 deletions(-) delete mode 100644 ngsi_adapter/script/build/files/jenkins/fiware-monitoring-ngsi-adapter-build.xml delete mode 100644 ngsi_adapter/script/build/files/jenkins/fiware-monitoring-ngsi-adapter-deploy-deb.xml delete mode 100644 ngsi_event_broker/script/build/files/jenkins/fiware-monitoring-ngsi-event-broker-build.xml delete mode 100644 ngsi_event_broker/script/build/files/jenkins/fiware-monitoring-ngsi-event-broker-deploy-deb.xml diff --git a/ngsi_adapter/script/build/files/debian/changelog b/ngsi_adapter/script/build/files/debian/changelog index 19c8fb6..9735cd2 100644 --- 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 Mon, 12 Jan 2015 18:30:00 +0200 + -- Telefónica I+D 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 deleted file mode 100644 index 90c1981..0000000 --- a/ngsi_adapter/script/build/files/jenkins/fiware-monitoring-ngsi-adapter-build.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - <a href="https://github.com/telefonicaid/fiware-monitoring/tree/develop/ngsi_adapter"> -FIWARE Monitoring GE: NGSI Adapter -</a> -<br><br><img src="/../jenkins/job/fiware-monitoring-ngsi-adapter-build/badge/icon"> -<a href="/../jenkins/job/metrics-queue-consumer">Metrics</a> -<img src="/../jenkins/job/metrics-queue-consumer/lastBuild/buildStatus" width="16"> - - false - - - - - - REPOSITORY - - - - https://github.com/telefonicaid/fiware-monitoring.git - https://github.com/fiware/fiware-monitoring.git - - - - - BRANCH - - develop - - - - - - - /../sonar/dashboard/index/com.telefonica.fiware:fiware-monitoring-ngsi-adapter - Sonar - gear2.gif - - - - - 87885021 - - - - - - /home/develenv/app/hudson/jobs/fiware-monitoring-ngsi-adapter-build/workspace - 37448083 - - - - - - - - 2 - - - $REPOSITORY - - - - - $BRANCH - - - false - - - - true - false - false - false - - - @midnight - - - false - - - ngsi_adapter/script/build/jenkins.sh build - - - - - - **/report/coverage/cobertura-coverage.xml - false - false - false - false - false - false - 0 - true - - - - METHOD - 8000000 - - - LINE - 8000000 - - - CONDITIONAL - 7000000 - - - - - - - METHOD - 0 - - - LINE - 0 - - - CONDITIONAL - 0 - - - - - - - METHOD - 0 - - - LINE - 0 - - - CONDITIONAL - 0 - - - - ASCII - - - **/report/test/TEST-xunit.xml - false - - - - fiware-monitoring-ngsi-adapter-deploy-deb - - SUCCESS - 0 - BLUE - true - - - - - - xterm - - - \ No newline at end of file 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 deleted file mode 100644 index 8771ef1..0000000 --- a/ngsi_adapter/script/build/files/jenkins/fiware-monitoring-ngsi-adapter-deploy-deb.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - <a href="https://github.com/telefonicaid/fiware-monitoring/tree/develop/ngsi_adapter"> -FIWARE Monitoring GE: NGSI Adapter (Ubuntu package) -</a> -<br><br><img src="/../jenkins/job/fiware-monitoring-ngsi-adapter-deploy-deb/badge/icon"> - - - -1 - 10 - -1 - -1 - - false - - - - - - REPOSITORY - - - - https://github.com/telefonicaid/fiware-monitoring.git - https://github.com/fiware/fiware-monitoring.git - - - - - BRANCH - - develop - - - - - 4719774 - - - ci-fiware-ubunt-01.hi.inet - - - /home/develenv/workspace/fiware-monitoring-ngsi-adapter-deploy-deb - 1328501 - - - - - - - - 2 - - - $REPOSITORY - - - - - $BRANCH - - - false - - - - ci-fiware-ubunt-01.hi.inet - false - false - false - false - - false - - - ngsi_adapter/script/build/jenkins.sh release - - - - - - **/*.deb - false - false - - - - - xterm - - - \ No newline at end of file diff --git a/ngsi_adapter/script/build/jenkins.sh b/ngsi_adapter/script/build/jenkins.sh index d8e01fb..f093334 100755 --- 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.IoT:$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 index 8af348f..098d8a0 100755 --- 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 index ddce7aa..2c2aaad 100644 --- 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 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) diff --git a/ngsi_event_broker/script/build/files/jenkins/fiware-monitoring-ngsi-event-broker-build.xml b/ngsi_event_broker/script/build/files/jenkins/fiware-monitoring-ngsi-event-broker-build.xml deleted file mode 100644 index 0fceada..0000000 --- a/ngsi_event_broker/script/build/files/jenkins/fiware-monitoring-ngsi-event-broker-build.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - <a href="https://github.com/telefonicaid/fiware-monitoring/tree/develop/ngsi_event_broker"> -FIWARE Monitoring GE: NGSI Event Broker -</a> -<br><br><img src="/../jenkins/job/fiware-monitoring-ngsi-event-broker-build/badge/icon"> -<a href="/../jenkins/job/metrics-queue-consumer">Metrics</a> -<img src="/../jenkins/job/metrics-queue-consumer/lastBuild/buildStatus" width="16"> - - - -1 - 10 - -1 - -1 - - false - - - - - - REPOSITORY - - - - https://github.com/telefonicaid/fiware-monitoring.git - https://github.com/fiware/fiware-monitoring.git - - - - - BRANCH - - develop - - - - - - - /../sonar/dashboard/index/com.telefonica.fiware:fiware-monitoring-ngsi-event-broker - Sonar - gear2.gif - - - - - 56171740 - - - - - - /home/develenv/app/hudson/jobs/fiware-monitoring-ngsi-event-broker-build/workspace - 36259644 - - - - - - - - 2 - - - $REPOSITORY - - - - - $BRANCH - - - false - - - - true - false - false - false - - - @midnight - - - false - - - ngsi_event_broker/script/build/jenkins.sh build - - - - - - - - - ngsi_event_broker/jenkins-cobertura-coverage.xml - false - false - false - false - false - false - 0 - true - - - - METHOD - 8000000 - - - LINE - 8000000 - - - CONDITIONAL - 7000000 - - - - - - - METHOD - 0 - - - LINE - 0 - - - CONDITIONAL - 0 - - - - - - - METHOD - 0 - - - LINE - 0 - - - CONDITIONAL - 0 - - - - ASCII - - - ngsi_event_broker/report/test/TEST-xunit-*.xml - false - - - - - fiware-monitoring-ngsi-event-broker-deploy-deb - - SUCCESS - 0 - BLUE - true - - - - - - xterm - - - \ No newline at end of file diff --git a/ngsi_event_broker/script/build/files/jenkins/fiware-monitoring-ngsi-event-broker-deploy-deb.xml b/ngsi_event_broker/script/build/files/jenkins/fiware-monitoring-ngsi-event-broker-deploy-deb.xml deleted file mode 100644 index 7bc80f8..0000000 --- a/ngsi_event_broker/script/build/files/jenkins/fiware-monitoring-ngsi-event-broker-deploy-deb.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - <a href="https://github.com/telefonicaid/fiware-monitoring/tree/develop/ngsi_event_broker"> -FIWARE Monitoring GE: NGSI Event Broker (Ubuntu package) -</a> -<br><br><img src="/../jenkins/job/fiware-monitoring-ngsi-event-broker-deploy-deb/badge/icon"> - - - -1 - 10 - -1 - -1 - - false - - - - - - REPOSITORY - - - - https://github.com/telefonicaid/fiware-monitoring.git - https://github.com/fiware/fiware-monitoring.git - - - - - BRANCH - - develop - - - - - 46646571 - - - ci-fiware-ubunt-01.hi.inet - - - /home/develenv/workspace/fiware-monitoring-ngsi-event-broker-deploy-deb - 41790349 - - - - - - - - 2 - - - $REPOSITORY - - - - - $BRANCH - - - false - - - - ci-fiware-ubunt-01.hi.inet - false - false - false - false - - false - - - ngsi_event_broker/script/build/jenkins.sh release - - - - - - - - - **/*.deb, **/*.src.tar.gz - false - false - - - - - - xterm - - - \ No newline at end of file diff --git a/ngsi_event_broker/script/build/jenkins.sh b/ngsi_event_broker/script/build/jenkins.sh index a9fb193..3681cd1 100755 --- a/ngsi_event_broker/script/build/jenkins.sh +++ b/ngsi_event_broker/script/build/jenkins.sh @@ -91,8 +91,8 @@ PRODUCT_NAME=$(sed -n '/\[PRODUCT_NAME\]/ {s/.*\[.*\].*\[\(.*\)\].*/\1/; p}' $PR PRODUCT_RELEASE=$(sed -n '/\[PRODUCT_RELEASE\]/ {s/.*\[.*\].*\[\(.*\)\].*/\1/; p}' $PROJECT_DIR/configure.ac) PROJECT_NAME=$(sed -n '/AC_INIT/ {s/.*\[PRODUCT_NAME-\(.*\)].*/\1/; p}' $PROJECT_DIR/configure.ac) PROJECT_VERSION=$(sed -n '/AC_INIT/ {s/.*,[ \t]*\(.*\))/\1/; p}' $PROJECT_DIR/configure.ac) -SONAR_PROJECT_NAME=$(echo "$PRODUCT_NAME-$PROJECT_NAME" | tr '_' '-') -SONAR_PROJECT_KEY=com.telefonica.IoT:$SONAR_PROJECT_NAME +SONAR_PROJECT_NAME="Monitoring NGSI Event Broker" +SONAR_PROJECT_KEY=com.telefonica.iot:monitoring-ngsi-event-broker # Dependencies RPM_DEPENDENCIES="wget gcc-c++ make autoconf automake libtool cppunit-devel libcurl-devel" @@ -172,7 +172,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_event_broker/script/build/release.sh b/ngsi_event_broker/script/build/release.sh index 8af348f..098d8a0 100755 --- a/ngsi_event_broker/script/build/release.sh +++ b/ngsi_event_broker/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\"