Skip to content

Commit

Permalink
contrib/ci.inria.fr: no need to cleanup the workdir inside subscripts
Browse files Browse the repository at this point in the history
We already cleanup the workdir in the JenkinsFiles,
no need to have subscripts pack the built dir,
and no need to have old source/built tarballs before building.

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
  • Loading branch information
bgoglin committed Aug 29, 2018
1 parent 786eba3 commit 7594c46
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 61 deletions.
11 changes: 0 additions & 11 deletions contrib/ci.inria.fr/job-1-check.sh
Expand Up @@ -16,11 +16,6 @@ set -x
# environment variables
test -f $HOME/.ciprofile && . $HOME/.ciprofile

# remove everything but the last 10 builds
ls | grep -v ^hwloc- | grep -v ^job- | xargs rm -rf || true
ls -td hwloc-* | tail -n +11 | xargs chmod u+w -R || true
ls -td hwloc-* | tail -n +11 | xargs rm -rf || true

# extract the tarball
tarball="$1"
basename=$(basename $tarball .tar.gz)
Expand Down Expand Up @@ -54,10 +49,4 @@ cd ..
# check renaming
(cd build/tests/hwloc/rename && make check)

# cleanup
rm -rf doc build/doc build-plugins/doc
cd ..
tar cfz ${basename}.build.tar.gz $basename
rm -rf $basename

exit 0
12 changes: 0 additions & 12 deletions contrib/ci.inria.fr/job-1-visualstudio.bat
Expand Up @@ -7,11 +7,6 @@ call %JENKINS_CONFIG_DIR%\\ciprofile.bat

set TARBALL=%1

REM remove everything but the last 10 builds
sh -c "rm -rf $(ls | grep -v ^hwloc- | grep -v ^job-) || true"
sh -c "rm -rf $(ls -td hwloc-* | tail -n +21) || true"
REM chmod not needed when not doing make distcheck

sh -c "tar xfz %TARBALL%"
if %errorlevel% neq 0 exit /b %errorlevel%

Expand All @@ -27,11 +22,4 @@ if %errorlevel% neq 0 exit /b %errorlevel%
x64\Release\hwloc-info.exe --support
if %errorlevel% neq 0 exit /b %errorlevel%

cd ..\..\..

sh -c "tar cfz %TARBALL:~0,-7%-build.tar.gz %TARBALL:~0,-7%"
if %errorlevel% neq 0 exit /b %errorlevel%

sh -c "rm -rf %TARBALL:~0,-7%"

exit /b 0
11 changes: 0 additions & 11 deletions contrib/ci.inria.fr/job-3-debug.sh
Expand Up @@ -16,11 +16,6 @@ set -x
# environment variables
test -f $HOME/.ciprofile && . $HOME/.ciprofile

# remove everything but the last 10 builds
ls | grep -v ^hwloc- | grep -v ^job- | xargs rm -rf || true
ls -td hwloc-* | tail -n +11 | xargs chmod u+w -R || true
ls -td hwloc-* | tail -n +11 | xargs rm -rf || true

# extract the tarball
tarball="$1"
basename=$(basename $tarball .tar.gz)
Expand All @@ -41,10 +36,4 @@ make check
tests/hwloc/wrapper.sh utils/lstopo/lstopo-no-graphics
cd ..

# cleanup
rm -rf doc build-plugins-debug/doc
cd ..
tar cfz ${basename}.build.tar.gz $basename
rm -rf $basename

exit 0
11 changes: 0 additions & 11 deletions contrib/ci.inria.fr/job-3-embedded.sh
Expand Up @@ -16,11 +16,6 @@ set -x
# environment variables
test -f $HOME/.ciprofile && . $HOME/.ciprofile

# remove everything but the last 10 builds
ls | grep -v ^hwloc- | grep -v ^job- | xargs rm -rf || true
ls -td hwloc-* | tail -n +11 | xargs chmod u+w -R || true
ls -td hwloc-* | tail -n +11 | xargs rm -rf || true

# extract the tarball
tarball="$1"
basename=$(basename $tarball .tar.gz)
Expand All @@ -35,10 +30,4 @@ touch configure
# embedded tests
(cd tests/hwloc/embedded && ./run-embedded-tests.sh ../../../$tarball)

# cleanup
rm -rf doc
cd ..
tar cfz ${basename}.build.tar.gz $basename
rm -rf $basename

exit 0
5 changes: 0 additions & 5 deletions contrib/ci.inria.fr/job-3-mingw.sh
Expand Up @@ -63,11 +63,6 @@ oldPATH=$PATH
rm -f hwloc-win*-build-*.zip || true

if test x$dotar = x1; then
# remove everything but the last 10 builds
rm -rf $(ls | grep -v ^hwloc- | grep -v ^job-) || true
chmod u+w -R $(ls -td hwloc-* | tail -n +11) || true
rm -rf $(ls -td hwloc-* | tail -n +11) || true

# extract the tarball
tarball="$1"
if ! test -f "$tarball"; then
Expand Down
11 changes: 0 additions & 11 deletions contrib/ci.inria.fr/job-3-sonarscanner.sh
Expand Up @@ -25,11 +25,6 @@ fi
# environment variables
test -f $HOME/.ciprofile && . $HOME/.ciprofile

# remove everything but the last 10 builds
ls | grep -v ^hwloc- | grep -v ^job- | xargs rm -rf || true
ls -td hwloc-* | tail -n +11 | xargs chmod u+w -R || true
ls -td hwloc-* | tail -n +11 | xargs rm -rf || true

# check that this is either master or vX.Y
if test x$hwloc_branch != xmaster; then
if test x$(echo "x${hwloc_branch}x" | sed -r -e 's/xv[0-9]+\.[0-9]+x//') != x; then
Expand Down Expand Up @@ -204,10 +199,4 @@ EOF
# Run the sonar-scanner analysis and submit to SonarQube server
sonar-scanner -X > sonar.log

# cleanup
rm -rf doc
cd ..
tar cfz ${basename}.build.tar.gz $basename
rm -rf $basename

exit 0

0 comments on commit 7594c46

Please sign in to comment.