May 2014 - Adminsys-commits - mailman.cloud.codelutin.com

r71 - scripts/maven-release
by maven-release＠users.forge.codelutin.com 20 May '14

20 May '14

Author: maven-release Date: 2014-05-20 10:34:16 +0200 (Tue, 20 May 2014) New Revision: 71 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/71 Log: refs #5074 (fix script deploy-to-demo-from-GIT.sh) Modified: scripts/maven-release/deploy-to-demo-from-GIT.sh Modified: scripts/maven-release/deploy-to-demo-from-GIT.sh =================================================================== --- scripts/maven-release/deploy-to-demo-from-GIT.sh 2014-05-19 12:22:49 UTC (rev 70) +++ scripts/maven-release/deploy-to-demo-from-GIT.sh 2014-05-20 08:34:16 UTC (rev 71) @@ -110,8 +110,8 @@ echo "Could not find $DEPLOY_TYPE/config file" bye_bye 1 fi -if [ ! -d svn ]; then - echo "Could not find $DEPLOY_TYPE/svn directory" +if [ ! -d git ]; then + echo "Could not find $DEPLOY_TYPE/git directory" bye_bye 1 fi

1 0

r70 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com 19 May '14

19 May '14

Author: tchemit Date: 2014-05-19 14:22:49 +0200 (Mon, 19 May 2014) New Revision: 70 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/70 Log: refs #5074 (add git post-receive hook) Added: scripts/redmine-tools/redmine-post-commit-git.sh Added: scripts/redmine-tools/redmine-post-commit-git.sh =================================================================== --- scripts/redmine-tools/redmine-post-commit-git.sh (rev 0) +++ scripts/redmine-tools/redmine-post-commit-git.sh 2014-05-19 12:22:49 UTC (rev 70) @@ -0,0 +1,25 @@ +#!/bin/sh +# +# Script lance a chaque commit +# + +#REPOS="$1" +#REV="$2" +PROJECT_NAME="$1" +DOMAIN="$2" +SCM_API_KEY="$3" +MAIL_DOMAIN="$DOMAIN" + +if [ -n "$(echo $MAIL_DOMAIN |grep codelutin.com)" ]; then + MAIL_DOMAIN=forge.codelutin.com +fi + +# refresh redmine scm viewer +wget "http://forge.$DOMAIN/sys/fetch_changesets?key=$SCM_API_KEY&id=$PROJECT_NAME" --spider &> /dev/null &2> /dev/null + +# send post-commit email +(cd /var/lib/git/git-$DOMAIN/$PROJECT_NAME.git ; python /usr/local/lib/python2.6/dist-packages/git_multimail-1.0.0-py2.6.egg/git_multimail.py) + +# touch project for nightly build +touch /var/cache/redmine/nightly-build/$DOMAIN/$PROJECT_NAME.site +touch /var/cache/redmine/nightly-build/$DOMAIN/$PROJECT_NAME.deploy-demo && chmod o+w /var/cache/redmine/nightly-build/$DOMAIN/$PROJECT_NAME.deploy-demo Property changes on: scripts/redmine-tools/redmine-post-commit-git.sh ___________________________________________________________________ Added: svn:executable + *

1 0

r69 - scripts/maven-release
by maven-release＠users.forge.codelutin.com 19 May '14

19 May '14

Author: maven-release Date: 2014-05-19 14:15:00 +0200 (Mon, 19 May 2014) New Revision: 69 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/69 Log: refs #5074 (ajout script deploy-to-demo-from-GIT.sh) Added: scripts/maven-release/deploy-to-demo-from-GIT.sh Added: scripts/maven-release/deploy-to-demo-from-GIT.sh =================================================================== --- scripts/maven-release/deploy-to-demo-from-GIT.sh (rev 0) +++ scripts/maven-release/deploy-to-demo-from-GIT.sh 2014-05-19 12:15:00 UTC (rev 69) @@ -0,0 +1,237 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +OLD_PATH=$(pwd) +APPLICATION_NAME=$(basename $OLD_PATH) + +DEPLOY_TYPES=$(find * -maxdepth 0 -type d -printf " %p") + +export JAVA_HOME=/opt/jdk +export JDK_HOME=$JAVA_HOME +export M2_HOME=/opt/maven + +bye_bye() { + cd $OLD_PATH + exit $1 +} + +print_usage_and_exit() { + echo "-----------------------------------------------------------------------------------" + echo "usage $(basename $0) [-h] [-b] [-d] [-k] [-m extraBuildParameters] [-r gitRevision] deployType" + echo " -h show usage and exit" + echo " -b for batch mode (no question asked)" + echo " -d for dryRun mode (nothing is deployed)" + echo " -k to keep incoming project version (do not transform version using the git revision)" + echo " -m extraBuildParameters (add extra parameters to maven build)" + echo " -r svnRevision (update svn to a specific revision, by default use HEAD)" + echo " deployType type of deploy to do (must be one amoung [$DEPLOY_TYPES])" + echo "" + echo "example: $(basename $0) -b -m\"-DperformRelease -Preporting\" -r101010 latest" + echo "-----------------------------------------------------------------------------------" + + bye_bye $1 +} + +test_ok_or_bye_bye() { + if [ $1 -eq 1 ]; then + echo "KO" + echo "$2 (see at $LOG_FILE)" + bye_bye 1 + else + echo "OK" + fi +} +echo -n "0/4 Check options and prepare git..." + +MAVEN_BUILD="clean install -Pcollect-deploy-files" +SVN_REV="HEAD" +KEEP_VERSION=0 # 0 when transform version using svn revision, 1 keep incoming version +BATCH_MODE=0 # 0 when interactive, 1 when batch mode +DRY_RUN=0 # 0 when execute, 1 when dry run +while getopts ":m:r:hbdk" opt; do + case $opt in + h) + echo "OK" + print_usage_and_exit 0 + ;; + b) + BATCH_MODE=1 + ;; + d) + DRY_RUN=1 + ;; + k) + KEEP_VERSION=1 + ;; + m) + MAVEN_BUILD="$MAVEN_BUILD $OPTARG" + ;; + r) + SVN_REV="$OPTARG" + ;; + \?) + echo "KO" + echo "Invalid option: -$OPTARG" >&2 + print_usage_and_exit 1 + ;; + :) + echo "KO" + echo "Option -$OPTARG requires an argument." >&2 + print_usage_and_exit 1 + ;; + esac + shift $((OPTIND-1)) +done + +# must have a last mandatory parameter +if [ ! $# -eq 1 ]; then + echo "KO" + echo "Mandatory deploy type not given" + print_usage_and_exit 1 +fi +DEPLOY_TYPE="$1" + +# check deploy type exist +if [ ! -d $DEPLOY_TYPE ]; then + echo "KO" + echo "Could not find deploy type $DEPLOY_TYPES (available: $DEPLOY_TYPES)" + bye_bye 1 +fi + +# check deploy structure +cd $DEPLOY_TYPE +if [ ! -f deploy ]; then + echo "KO" + echo "Could not find $DEPLOY_TYPE/deploy file" + bye_bye 1 +fi +if [ ! -f config ]; then + echo "KO" + echo "Could not find $DEPLOY_TYPE/config file" + bye_bye 1 +fi +if [ ! -d svn ]; then + echo "Could not find $DEPLOY_TYPE/svn directory" + bye_bye 1 +fi + +cd git + +# revert git +git checkout . > /dev/null +git clean -f > /dev/null + +# update git +git pull > /dev/null + +# get subversion revision +REV=`git log -n 1 --pretty=format:"%H"` + +# get project version +VERSION=`xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml` + +# get new version +if [ $KEEP_VERSION -eq 1 ]; then + NEW_VERSION=$VERSION +else + NEW_VERSION=`${M2_HOME}/bin/mvn -N helper:transform-project-version -Dhelper.newVersionPattern="#V-rev#R" -Dhelper.revision=$REV -DhelperPluginVersion=2.0 -Dhelper.versionKey=deployKey help:evaluate -Dexpression=deployKey | grep -v "\[" | grep "-rev" | grep -v "Download"` +fi + +echo "OK" +echo "----------------------------------------------------------" +echo "--- Deploy summary ---------------------------------------" +echo "----------------------------------------------------------" +echo "- application = $APPLICATION_NAME" +echo "- deployType = $DEPLOY_TYPE" +if [ $BATCH_MODE -eq 1 ]; then + echo "- batchMode = ON" +fi +if [ $DRY_RUN -eq 1 ]; then + echo "- dryRun = ON" +fi +if [ $KEEP_VERSION -eq 1 ]; then + echo "- keepVersion = ON" +fi +echo "- revision detected = $REV" +echo "- version detected = $VERSION" +echo "- new version = $NEW_VERSION" +echo "- build parameters = $MAVEN_BUILD" +echo "----------------------------------------------------------" + +if [ $BATCH_MODE -eq 0 ]; then + # ask user to confirm + echo -n "Accept the change ? [Y/n]" + read r + if [ ! -z "$r" -o "$r" = "Y" ]; then + echo "User cancel operation" + bye_bye 1 + fi +fi + +# log file +LOG_FILE=/tmp/deploy-to-demo-$APPLICATION_NAME-$DEPLOY_TYPE.log + +# change version in pom.xml +echo -n "1/4 Change to version $NEW_VERSION..." +if [ $KEEP_VERSION -eq 1 ]; then + echo "OK (keep version, skip this step)" +else + ${M2_HOME}/bin/mvn versions:set -DnewVersion=$NEW_VERSION > $LOG_FILE + test_ok_or_bye_bye $? "Error while executing '${M2_HOME}/bin/mvn versions:set -DnewVersion=$NEW_VERSION'" +fi + +# build application +echo -n "2/4 Build application..." +${M2_HOME}/bin/mvn $MAVEN_BUILD > $LOG_FILE +test_ok_or_bye_bye $? "Error while executing '${M2_HOME}/bin/mvn $MAVEN_BUILD'" + +cd .. + +echo -n "3/4 Deploy to demo..." + +if [ $DRY_RUN -eq 1 ]; then + echo "OK (dry run, skip this step)" +else + + # build the curl deploy options + DEPLOY_ARGS="-s " + for i in $(cat deploy); do + DEPLOY_ARGS="$DEPLOY_ARGS -F \"$i\""; + done + for i in $(cat svn/target/collect-deploy-files.txt); do + DEPLOY_ARGS="$DEPLOY_ARGS -F \"APP_WAR=@$i\"" + continue + done + + # Create a file to execute the curl command (pb with @ in bash execution...) + DEPLOY_ARGS="$DEPLOY_ARGS http://demo-ng.codelutin.com/deploy.cgi" + DEPLOY_COMMAND=/tmp/deploy-to-demo-curl-$APPLICATION_NAME.sh + cat << EOF > $DEPLOY_COMMAND + curl $DEPLOY_ARGS +EOF + + chmod +x $DEPLOY_COMMAND + + # execute the curl command + cat $DEPLOY_COMMAND > $LOG_FILE + . $DEPLOY_COMMAND >> $LOG_FILE + + # check there is a Deploy success in response" + if [ $? -eq 0 ]; then + grep "Deploy success" $LOG_FILE > /dev/null + fi + test_ok_or_bye_bye $? "Could not deploy to demo" +fi + +# revert any change +echo -n "4/4 Revert local modifications and clean target..." + +cd git +git checkout . > /dev/null +git clean -f > /dev/null +${M2_HOME}/bin/mvn clean > /dev/null +cd .. + +echo "OK" + +bye_bye 0 Property changes on: scripts/maven-release/deploy-to-demo-from-GIT.sh ___________________________________________________________________ Added: svn:executable + *

1 0

r68 - scripts/maven-release
by maven-release＠users.forge.codelutin.com 19 May '14

19 May '14

Author: maven-release Date: 2014-05-19 14:14:18 +0200 (Mon, 19 May 2014) New Revision: 68 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/68 Log: use absolute paths Modified: scripts/maven-release/cron-nightly-build Modified: scripts/maven-release/cron-nightly-build =================================================================== --- scripts/maven-release/cron-nightly-build 2014-05-03 08:08:12 UTC (rev 67) +++ scripts/maven-release/cron-nightly-build 2014-05-19 12:14:18 UTC (rev 68) @@ -1,5 +1,5 @@ #! /bin/sh -./deploy-nightly-builds-to-demo.sh -./deploy-nightly-snapshot-site.sh -./clean-nightly-builds.sh +/home/maven-release/bin/deploy-nightly-builds-to-demo.sh +/home/maven-release/bin/deploy-nightly-snapshot-site.sh +/home/maven-release/bin/clean-nightly-builds.sh \ No newline at end of file

1 0

r67 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com 03 May '14

03 May '14

Author: tchemit Date: 2014-05-03 10:08:12 +0200 (Sat, 03 May 2014) New Revision: 67 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/67 Log: refs #4153 Modified: scripts/redmine-tools/update-tomcat-7.sh Modified: scripts/redmine-tools/update-tomcat-7.sh =================================================================== --- scripts/redmine-tools/update-tomcat-7.sh 2014-05-03 08:07:09 UTC (rev 66) +++ scripts/redmine-tools/update-tomcat-7.sh 2014-05-03 08:08:12 UTC (rev 67) @@ -16,7 +16,7 @@ DEBUG=false #MIRROR=http://mirrors.linsrv.net/apache/tomcat -MIRROR=http://www.carfab.com/apachesoftware +MIRROR=http://www.carfab.com/apachesoftware/tomcat TARGET_DIR=/opt/repository LINK_DIR=/opt @@ -43,7 +43,7 @@ # @param $2 tomcat version 6, 7 or 8 getLastRelease () { local VERSION=$2 - local result=$(curl -s $MIRROR/tomcat/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') + local result=$(curl -s $MIRROR/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') debug "getLastRelease: $result" eval $1=\$result }

1 0

r66 - demo-tools/tomcat
by tchemit＠users.forge.codelutin.com 03 May '14

03 May '14

Author: tchemit Date: 2014-05-03 10:07:09 +0200 (Sat, 03 May 2014) New Revision: 66 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/66 Log: refs #4153 (typo in result variable) Modified: demo-tools/tomcat/check-get-tomcat.sh Modified: demo-tools/tomcat/check-get-tomcat.sh =================================================================== --- demo-tools/tomcat/check-get-tomcat.sh 2014-05-03 08:05:38 UTC (rev 65) +++ demo-tools/tomcat/check-get-tomcat.sh 2014-05-03 08:07:09 UTC (rev 66) @@ -17,7 +17,7 @@ DEBUG=false MIRROR=http://mirrors.linsrv.net/apache/tomcat -MIRROR=http://www.carfab.com/apachesoftware +MIRROR=http://www.carfab.com/apachesoftware/tomcat TARGET_DIR=/opt/repository LINK_DIR=/opt @@ -44,7 +44,7 @@ # @param $2 tomcat version 6, 7 or 8 getLastRelease () { local VERSION=$2 - local result=$(curl -s $MIRROR/tomcat/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') + local result=$(curl -s $MIRROR/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') debug "last version is $result" eval $1=\$result }

1 0

r65 - forge-tools/sys
by maven-release＠users.forge.codelutin.com 03 May '14

03 May '14

Author: maven-release Date: 2014-05-03 10:05:38 +0200 (Sat, 03 May 2014) New Revision: 65 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/65 Log: refs #4153 Modified: forge-tools/sys/check-get-tomcat.sh Modified: forge-tools/sys/check-get-tomcat.sh =================================================================== --- forge-tools/sys/check-get-tomcat.sh 2014-05-03 08:03:31 UTC (rev 64) +++ forge-tools/sys/check-get-tomcat.sh 2014-05-03 08:05:38 UTC (rev 65) @@ -17,7 +17,8 @@ # DEBUG=false -MIRROR=http://mirrors.linsrv.net/apache/tomcat +#MIRROR=http://mirrors.linsrv.net/apache/tomcat +MIRROR=http://www.carfab.com/apachesoftware/tomcat TARGET_DIR=/opt/repository LINK_DIR=/opt @@ -44,7 +45,7 @@ # @param $2 tomcat version 6, 7 or 8 getLastRelease () { local VERSION=$2 - local result=$(curl -s http://mirrors.linsrv.net/apache/tomcat/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') + local result=$(curl -s $MIRROR/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') debug "last version is $result" eval $1=\$result }

1 0

r64 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com 03 May '14

03 May '14

Author: tchemit Date: 2014-05-03 10:03:31 +0200 (Sat, 03 May 2014) New Revision: 64 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/64 Log: refs #4153 (mirror is down) Modified: scripts/redmine-tools/update-tomcat-7.sh Modified: scripts/redmine-tools/update-tomcat-7.sh =================================================================== --- scripts/redmine-tools/update-tomcat-7.sh 2014-05-03 08:00:43 UTC (rev 63) +++ scripts/redmine-tools/update-tomcat-7.sh 2014-05-03 08:03:31 UTC (rev 64) @@ -15,7 +15,8 @@ # DEBUG=false -MIRROR=http://mirrors.linsrv.net/apache/tomcat +#MIRROR=http://mirrors.linsrv.net/apache/tomcat +MIRROR=http://www.carfab.com/apachesoftware TARGET_DIR=/opt/repository LINK_DIR=/opt @@ -42,7 +43,7 @@ # @param $2 tomcat version 6, 7 or 8 getLastRelease () { local VERSION=$2 - local result=$(curl -s http://mirrors.linsrv.net/apache/tomcat/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') + local result=$(curl -s $MIRROR/tomcat/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') debug "getLastRelease: $result" eval $1=\$result }

1 0

r63 - demo-tools/tomcat
by tchemit＠users.forge.codelutin.com 03 May '14

03 May '14

Author: tchemit Date: 2014-05-03 10:00:43 +0200 (Sat, 03 May 2014) New Revision: 63 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/63 Log: fix #4153 Modified: demo-tools/tomcat/apache-demo-ng demo-tools/tomcat/check-get-tomcat.sh demo-tools/tomcat/tomcat-default Modified: demo-tools/tomcat/apache-demo-ng =================================================================== --- demo-tools/tomcat/apache-demo-ng 2014-04-17 06:23:10 UTC (rev 62) +++ demo-tools/tomcat/apache-demo-ng 2014-05-03 08:00:43 UTC (rev 63) @@ -56,6 +56,8 @@ ErrorLog ${APACHE_LOG_DIR}/demo-ng-error.log CustomLog ${APACHE_LOG_DIR}/demo-ng-access.log combined + RewriteEngine On + # inclusion des fichiers de configuration pour chaque application, soit # globalement pour toutes les demo (latest, staging, stable) soit # individuellement @@ -75,6 +77,10 @@ # pour ne pas servir de proxy a la terre entiere ProxyRequests off + # exclude agrosyst stable and staging + ProxyPass /agrosyst-stable ! + ProxyPass /agrosyst-staging ! + ProxyPassMatch ^/(.*)-stable/?(.*)$ ajp://localhost:18971/$1-stable/$2 ProxyPassMatch ^/(.*)-staging/?(.*)$ ajp://localhost:18972/$1-staging/$2 ProxyPassMatch ^/(.*)-latest/?(.*)$ ajp://localhost:18973/$1-latest/$2 Modified: demo-tools/tomcat/check-get-tomcat.sh =================================================================== --- demo-tools/tomcat/check-get-tomcat.sh 2014-04-17 06:23:10 UTC (rev 62) +++ demo-tools/tomcat/check-get-tomcat.sh 2014-05-03 08:00:43 UTC (rev 63) @@ -17,6 +17,7 @@ DEBUG=false MIRROR=http://mirrors.linsrv.net/apache/tomcat +MIRROR=http://www.carfab.com/apachesoftware TARGET_DIR=/opt/repository LINK_DIR=/opt @@ -43,7 +44,7 @@ # @param $2 tomcat version 6, 7 or 8 getLastRelease () { local VERSION=$2 - local result=$(curl -s http://mirrors.linsrv.net/apache/tomcat/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') + local result=$(curl -s $MIRROR/tomcat/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') debug "last version is $result" eval $1=\$result } Modified: demo-tools/tomcat/tomcat-default =================================================================== --- demo-tools/tomcat/tomcat-default 2014-04-17 06:23:10 UTC (rev 62) +++ demo-tools/tomcat/tomcat-default 2014-05-03 08:00:43 UTC (rev 63) @@ -2,7 +2,7 @@ TOMCAT_GROUP=www-data JAVA_HOME=/opt/jdk JAVA_OPTS="-Djava.awt.headless=true -XX:+UseConcMarkSweepGC -Dfile.encoding=UTF-8" -JAVA_OPTS="$JAVA_OPTS -XX:MaxPermSize=400m -Xms512m -Xmx1024m -XX:-UseGCOverheadLimit" +JAVA_OPTS="$JAVA_OPTS -XX:MaxPermSize=512m -Xms512m -Xmx2048m -XX:-UseGCOverheadLimit" JTOMCAT_SECURITY=no LOGFILE_DAYS=30 JVM_TMP=/tmp/tomcat-temp

1 0