diff --git a/jenkins/app/jenkinsfile b/jenkins/app/jenkinsfile index 3736552ee56ca0a55babc2ea83b63c1aa4961f88..5ab63a37683bbead49d12e02d49639576aafd036 100644 --- a/jenkins/app/jenkinsfile +++ b/jenkins/app/jenkinsfile @@ -78,8 +78,8 @@ pipeline { bat '.\\build.bat' bat 'powershell "cp -v meta/%release%/%release%.PNG AppPackages/DistroLauncher-Appx/"' - bat 'powershell Compress-Archive -Path ".\\AppPackages\\DistroLauncher-Appx\\DistroLauncher-Appx_*\\*" -DestinationPath sideload-%release%.zip' - archiveArtifacts artifacts: "sideload-${release}.zip", followSymlinks: false + bat 'powershell Compress-Archive -Path ".\\AppPackages\\DistroLauncher-Appx\\DistroLauncher-Appx_*\\*" -DestinationPath openEuler-WSL-%release%.zip' + archiveArtifacts artifacts: "openEuler-WSL-${release}.zip", followSymlinks: false script { if (publish == 'yes') { dir('AppPackages/DistroLauncher-Appx') { diff --git a/jenkins/rootfs/cleanup.sh b/jenkins/rootfs/cleanup.sh index 734757ab397c611906ad8a0023c2b015de5997a2..bd2fa51a2d7a31cb478e66716326cca1ced26bd5 100644 --- a/jenkins/rootfs/cleanup.sh +++ b/jenkins/rootfs/cleanup.sh @@ -1,6 +1,9 @@ #!/bin/bash +docker info docker images docker ps -a docker buildx ls docker buildx du +docker container prune -f +docker image prune -f diff --git a/jenkins/rootfs/do_build_rootfs.sh b/jenkins/rootfs/do_build_rootfs.sh index 90dfaeb4f711499af0fd623b5ee6f52f4dd9534d..300fa7e77b602973dfb430f4fb6841105487add1 100755 --- a/jenkins/rootfs/do_build_rootfs.sh +++ b/jenkins/rootfs/do_build_rootfs.sh @@ -1,13 +1,13 @@ #!/bin/bash set -eE +set -o pipefail trap cleanup EXIT function cleanup() { + set +eE [ ! -z "$(docker buildx ls | grep buildx-$release-$arch)" ] && docker buildx rm buildx-$release-$arch - sleep 10 - docker ps -aq --filter ancestor=openeuler-wsl:$release-$arch | xargs -r docker stop - docker rmi openeuler-wsl:$release-$arch + return 0 } function print_args() { @@ -21,9 +21,6 @@ function print_args() { } [ -d $WORKSPACE/outdir/ ] && rm -rvf $WORKSPACE/outdir/* || mkdir -pv $WORKSPACE/outdir -docker info -docker buildx ls -docker ps -a print_args BUILD_TYPE="release" touch $WORKSPACE/docker/openEuler-daily.repo