diff --git a/Jenkinsfile b/Jenkinsfile index 91f7da3..cc984d6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,10 +23,6 @@ pipeline { stage("Setup workspace") { agent none steps { - sh "ls -alch /" - sh "ls -alch /var/" - sh "ls -alch /var/jenkins_home/" - sh "ls -alch /var/jenkins_cache/" sh "mkdir -p \"/var/jenkins_cache/.m2\"" sh "chown 1000:1000 -R \"/var/jenkins_cache/.m2\"" sh "mkdir -p \"/var/jenkins_cache/.ccache\"" @@ -34,7 +30,7 @@ pipeline { sh "mkdir -p \"${workspace}/work\"" sh "chown 1000:1000 -R \"${workspace}/work\"" sh "mkdir -p \"${workspace}/output\"" - sh "chown 1000:1000 -R \"${workspace}/output\"" + sh "chown 1000:1000 -R \"${workspace}\"" } } @@ -44,7 +40,7 @@ pipeline { dir 'jenkins/docker' filename 'dockerfile' additionalBuildArgs '--build-arg version=1.0.0 --build-arg UID=1000 --build-arg GID=1000 --build-arg UNAME=jenkins' - args "-v \"${workspace}/tdlight-java/src/main:/home/jenkins/output\" -v \"/var/jenkins_cache/.m2:/home/jenkins/.m2\" -v \"/var/jenkins_cache/.ccache:/home/jenkins/.ccache:rw\" -v \"${workspace}:/home/jenkins/work\"" + args "-v \"${workspace}/tdlight-java/src/main:/home/jenkins/output:rw\" -v \"/var/jenkins_cache/.m2:/home/jenkins/.m2:rw\" -v \"/var/jenkins_cache/.ccache:/home/jenkins/.ccache:rw\" -v \"${workspace}:/home/jenkins/work:rw\"" reuseNode false } } diff --git a/jenkins/scripts/compile.sh b/jenkins/scripts/compile.sh index adca70c..1c55a19 100755 --- a/jenkins/scripts/compile.sh +++ b/jenkins/scripts/compile.sh @@ -9,11 +9,8 @@ bash ./jenkins/scripts/setup_workspace.sh # ====== Build Td echo "JAVA_INCLUDE_PATH:$JAVA_INCLUDE_PATH" -ls -alch $JAVA_INCLUDE_PATH echo "JAVA_INCLUDE_PATH2:$JAVA_INCLUDE_PATH2" -ls -alch $JAVA_INCLUDE_PATH2 echo "JAVA_AWT_INCLUDE_PATH:$JAVA_AWT_INCLUDE_PATH" -ls -alch $JAVA_AWT_INCLUDE_PATH # Prepare build cd $TD_BUILD_DIR if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then diff --git a/jenkins/scripts/setup_variables.sh b/jenkins/scripts/setup_variables.sh index 6265346..3c857ab 100755 --- a/jenkins/scripts/setup_variables.sh +++ b/jenkins/scripts/setup_variables.sh @@ -83,7 +83,7 @@ echo "TRAVIS_OS_NAME_SHORT=${TRAVIS_OS_NAME_SHORT}" echo "SRC_TDJNI_LIBNAME=${SRC_TDJNI_LIBNAME}" echo "DEST_TDJNI_LIBNAME=${DEST_TDJNI_LIBNAME}" echo "TDLIB_RESOURCES_OUTPUT_DIR=${TDLIB_RESOURCES_OUTPUT_DIR}" -echo "CURRENT DIRECTORY*=$(pwd)" +echo "CURRENT DIRECTORY* ($(pwd)):" ls -alch "$(pwd)" -echo "WORK DIRECTORY CONTENT* (${TRAVIS_BUILD_DIR})=" +echo "WORK DIRECTORY CONTENT* (${TRAVIS_BUILD_DIR}):" ls -alch "$TRAVIS_BUILD_DIR" diff --git a/jenkins/scripts/setup_workspace.sh b/jenkins/scripts/setup_workspace.sh index 83aefba..150755d 100755 --- a/jenkins/scripts/setup_workspace.sh +++ b/jenkins/scripts/setup_workspace.sh @@ -22,8 +22,6 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "Linux" echo "CCACHE statistics:" ccache -s - echo "CCACHE dir content: $CCACHE_DIR" - ls -alch "$CCACHE_DIR" elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then echo "OSX" elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then