Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions script/cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ def pre_rsync_repo(repos):
repoDest=$destPrefix-$buildid$destSuffix
repoCur=$destPrefix-CURRENT$destSuffix
[ -z "__STAGING" ] || repoCur=$destPrefix-__STAGING-CURRENT$destSuffix
echo "rsync --timeout=3600 -rtlp4 --delete --specials PRODUCTREPOPATH/$src/ /var/lib/openqa/factory/repo/$repoCur"
echo "rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/$repoCur/ /var/lib/openqa/factory/repo/$repoCur/ /var/lib/openqa/factory/repo/$repoDest/"
echo "rsync --timeout=3600 -rtlp4 --delete --specials PRODUCTREPOPATH/$src/ /var/lib/openqa/factory/repo/fixed/$repoCur"
echo "rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/$repoCur/ /var/lib/openqa/factory/repo/$repoCur/ /var/lib/openqa/factory/repo/$repoDest/"
done < <(grep $repo$additional_repo_suffix __envsub/files_repo.lst)
done
'''
Expand Down Expand Up @@ -172,8 +172,8 @@ def rsync_repodir2():
dest=${dest//-Media2/}
Mdia=Media2
[[ ! $src =~ .*\.license ]] || Mdia=Media2.license
echo rsync --timeout=3600 -rtlp4 --delete --specials RSYNCFILTER PRODUCTREPOPATH/*$Mdia/ /var/lib/openqa/factory/repo/$dest-CURRENT-debuginfo/
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/$dest-CURRENT-debuginfo/ /var/lib/openqa/factory/repo/$dest-CURRENT-debuginfo/ /var/lib/openqa/factory/repo/$dest-$buildid-debuginfo
echo rsync --timeout=3600 -rtlp4 --delete --specials RSYNCFILTER PRODUCTREPOPATH/*$Mdia/ /var/lib/openqa/factory/repo/fixed/$dest-CURRENT-debuginfo/
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/$dest-CURRENT-debuginfo/ /var/lib/openqa/factory/repo/fixed/$dest-CURRENT-debuginfo/ /var/lib/openqa/factory/repo/$dest-$buildid-debuginfo
done < <(grep ${arch//i686/i586} __envsub/files_repo.lst | grep Media2 )
done
'''
Expand All @@ -183,21 +183,21 @@ def rsync_repomultiarch(destpath, debug, source):
destpath = destpath.rstrip("/")
dest = os.path.basename(destpath)
res = '''
echo rsync --timeout=3600 -rtlp4 --delete --specials PRODUCTREPOPATH/'''+ destpath +'''/ /var/lib/openqa/factory/repo/''' + dest + '''-CURRENT
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/''' + dest + '''-CURRENT/ /var/lib/openqa/factory/repo/''' + dest + '''-CURRENT/ /var/lib/openqa/factory/repo/''' + dest + '''-$buildid/
echo rsync --timeout=3600 -rtlp4 --delete --specials PRODUCTREPOPATH/'''+ destpath +'''/ /var/lib/openqa/factory/repo/fixed/''' + dest + '''-CURRENT
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/''' + dest + '''-CURRENT/ /var/lib/openqa/factory/repo/fixed/''' + dest + '''-CURRENT/ /var/lib/openqa/factory/repo/''' + dest + '''-$buildid/
'''

if debug:
debugfilter = "--include=" + debug + " --exclude={aarch64,armv7hl,i586,i686,noarch,nosrc,ppc64,ppc64le,riscv64,s390x,src,x86_64}/*"
res = res + '''
echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + debugfilter + ''' PRODUCTREPOPATH/'''+ destpath +'''-Debug/ /var/lib/openqa/factory/repo/''' + dest + '''-Debug-CURRENT/
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/''' + dest + '''-Debug-CURRENT/ /var/lib/openqa/factory/repo/''' + dest + '''-Debug-CURRENT/ /var/lib/openqa/factory/repo/''' + dest + '''-Debug-$buildid/'''
echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + debugfilter + ''' PRODUCTREPOPATH/'''+ destpath +'''-Debug/ /var/lib/openqa/factory/repo/fixed/''' + dest + '''-Debug-CURRENT/
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/''' + dest + '''-Debug-CURRENT/ /var/lib/openqa/factory/repo/fixed/''' + dest + '''-Debug-CURRENT/ /var/lib/openqa/factory/repo/''' + dest + '''-Debug-$buildid/'''

if source:
sourcefilter = "--include=" + source + " --exclude={aarch64,armv7hl,i586,i686,noarch,nosrc,ppc64,ppc64le,riscv64,s390x,src,x86_64}/*"
res = res + '''
echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + sourcefilter + ''' PRODUCTREPOPATH/'''+ destpath +'''-Source/ /var/lib/openqa/factory/repo/''' + dest + '''-Source-CURRENT/
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/''' + dest + '''-Source-CURRENT/ /var/lib/openqa/factory/repo/''' + dest + '''-Source-CURRENT/ /var/lib/openqa/factory/repo/''' + dest + '''-Source-$buildid/'''
echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + sourcefilter + ''' PRODUCTREPOPATH/'''+ destpath +'''-Source/ /var/lib/openqa/factory/repo/fixed/''' + dest + '''-Source-CURRENT/
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/''' + dest + '''-Source-CURRENT/ /var/lib/openqa/factory/repo/fixed/''' + dest + '''-Source-CURRENT/ /var/lib/openqa/factory/repo/''' + dest + '''-Source-$buildid/'''

return res

Expand Down Expand Up @@ -235,8 +235,8 @@ def rsync_repodir1_dest_media0(dest, debug, source, folder):
if debug:
xtra="--include=" + debug + " --exclude={aarch64,armv7hl,i586,i686,noarch,nosrc,ppc64,ppc64le,riscv64,s390x,src,x86_64}/*"
res = res + '''
echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + xtra + ''' PRODUCTREPOPATH/''' + folder + '''/$src/ /var/lib/openqa/factory/repo/$dest-CURRENT-Debug/
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/$dest-CURRENT-Debug/ /var/lib/openqa/factory/repo/$dest-CURRENT-Debug/ /var/lib/openqa/factory/repo/$dest-$buildid-Debug
echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + xtra + ''' PRODUCTREPOPATH/''' + folder + '''/$src/ /var/lib/openqa/factory/repo/fixed/$dest-CURRENT-Debug/
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/$dest-CURRENT-Debug/ /var/lib/openqa/factory/repo/fixed/$dest-CURRENT-Debug/ /var/lib/openqa/factory/repo/$dest-$buildid-Debug
'''
res = res + '''
continue
Expand All @@ -249,17 +249,17 @@ def rsync_repodir1_dest_media0(dest, debug, source, folder):
if source:
xtra="--include=" + source + " --exclude={aarch64,armv7hl,i586,i686,noarch,nosrc,ppc64,ppc64le,riscv64,s390x,src,x86_64}/*"
res = res + '''
echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + xtra + ''' PRODUCTREPOPATH/''' + folder + '''/$src/ /var/lib/openqa/factory/repo/$dest-CURRENT-Source/
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/$dest-CURRENT-Source/ /var/lib/openqa/factory/repo/$dest-CURRENT-Source/ /var/lib/openqa/factory/repo/$dest-$buildid-Source
echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + xtra + ''' PRODUCTREPOPATH/''' + folder + '''/$src/ /var/lib/openqa/factory/repo/fixed/$dest-CURRENT-Source/
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/$dest-CURRENT-Source/ /var/lib/openqa/factory/repo/fixed/$dest-CURRENT-Source/ /var/lib/openqa/factory/repo/$dest-$buildid-Source
'''
res = res + '''
continue
}
'''

res = res + '''
echo rsync --timeout=3600 -rtlp4 --delete --specials PRODUCTREPOPATH/''' + folder + '''/$src/ /var/lib/openqa/factory/repo/$dest-CURRENT/
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/$dest-CURRENT/ /var/lib/openqa/factory/repo/$dest-CURRENT/ /var/lib/openqa/factory/repo/$dest-$buildid
echo rsync --timeout=3600 -rtlp4 --delete --specials PRODUCTREPOPATH/''' + folder + '''/$src/ /var/lib/openqa/factory/repo/fixed/$dest-CURRENT/
echo rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/$dest-CURRENT/ /var/lib/openqa/factory/repo/fixed/$dest-CURRENT/ /var/lib/openqa/factory/repo/$dest-$buildid
done < <(LANG=C.UTF-8 sort __envsub/files_repo_''' + repo + '''.lst )
# done
'''
Expand Down
4 changes: 2 additions & 2 deletions t/abs/TestVersionFromMedia1/print_rsync_repo.before
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/TestVersionFromMedia1/test/*repo/*Module-RT*x86_64*/*Media1/ /var/lib/openqa/factory/repo/SLE-15-SP3-Module-RT-POOL-x86_64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/SLE-15-SP3-Module-RT-POOL-x86_64-CURRENT/ /var/lib/openqa/factory/repo/SLE-15-SP3-Module-RT-POOL-x86_64-CURRENT/ /var/lib/openqa/factory/repo/SLE-15-SP3-Module-RT-POOL-x86_64-Build0007
rsync --timeout=3600 -rtlp4 --delete --specials obspublish::openqa/TestVersionFromMedia1/test/*repo/*Module-RT*x86_64*/*Media1/ /var/lib/openqa/factory/repo/fixed/SLE-15-SP3-Module-RT-POOL-x86_64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/SLE-15-SP3-Module-RT-POOL-x86_64-CURRENT/ /var/lib/openqa/factory/repo/fixed/SLE-15-SP3-Module-RT-POOL-x86_64-CURRENT/ /var/lib/openqa/factory/repo/SLE-15-SP3-Module-RT-POOL-x86_64-Build0007
16 changes: 8 additions & 8 deletions t/obs/SUSE:ALP:Products:Bedrock:0.1/print_rsync_repo.before
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Bedrock:0.1//*images/local/000product:ALP-Bedrock-ftp-POOL**x86_64*/*Media1.license/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-x86_64.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-x86_64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-x86_64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-x86_64.license-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Bedrock:0.1//*images/local/000product:ALP-Bedrock-ftp-POOL**x86_64*/*Media1/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-x86_64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-x86_64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-x86_64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-x86_64-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Bedrock:0.1//*images/local/000product:ALP-Bedrock-ftp-POOL**aarch64*/*Media1.license/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-aarch64.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-aarch64.license-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Bedrock:0.1//*images/local/000product:ALP-Bedrock-ftp-POOL**aarch64*/*Media1/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-aarch64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-aarch64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-aarch64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-aarch64-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Bedrock:0.1//*images/local/000product:ALP-Bedrock-ftp-POOL**x86_64*/*Media1.license/ /var/lib/openqa/factory/repo/fixed/ALP-Bedrock-0.1-x86_64.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/ALP-Bedrock-0.1-x86_64.license-CURRENT/ /var/lib/openqa/factory/repo/fixed/ALP-Bedrock-0.1-x86_64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-x86_64.license-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Bedrock:0.1//*images/local/000product:ALP-Bedrock-ftp-POOL**x86_64*/*Media1/ /var/lib/openqa/factory/repo/fixed/ALP-Bedrock-0.1-x86_64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/ALP-Bedrock-0.1-x86_64-CURRENT/ /var/lib/openqa/factory/repo/fixed/ALP-Bedrock-0.1-x86_64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-x86_64-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Bedrock:0.1//*images/local/000product:ALP-Bedrock-ftp-POOL**aarch64*/*Media1.license/ /var/lib/openqa/factory/repo/fixed/ALP-Bedrock-0.1-aarch64.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/ALP-Bedrock-0.1-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/fixed/ALP-Bedrock-0.1-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-aarch64.license-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Bedrock:0.1//*images/local/000product:ALP-Bedrock-ftp-POOL**aarch64*/*Media1/ /var/lib/openqa/factory/repo/fixed/ALP-Bedrock-0.1-aarch64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/ALP-Bedrock-0.1-aarch64-CURRENT/ /var/lib/openqa/factory/repo/fixed/ALP-Bedrock-0.1-aarch64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Bedrock-0.1-aarch64-Build2.3
16 changes: 8 additions & 8 deletions t/obs/SUSE:ALP:Products:Micro:0.1/print_rsync_repo.before
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Micro:0.1//*images/local/000product:ALP-Micro-ftp-POOL**x86_64*/*Media1.license/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-x86_64.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Micro-0.1-x86_64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-x86_64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-x86_64.license-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Micro:0.1//*images/local/000product:ALP-Micro-ftp-POOL**x86_64*/*Media1/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-x86_64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Micro-0.1-x86_64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-x86_64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-x86_64-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Micro:0.1//*images/local/000product:ALP-Micro-ftp-POOL**aarch64*/*Media1.license/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-aarch64.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Micro-0.1-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-aarch64.license-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Micro:0.1//*images/local/000product:ALP-Micro-ftp-POOL**aarch64*/*Media1/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-aarch64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Micro-0.1-aarch64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-aarch64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-aarch64-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Micro:0.1//*images/local/000product:ALP-Micro-ftp-POOL**x86_64*/*Media1.license/ /var/lib/openqa/factory/repo/fixed/ALP-Micro-0.1-x86_64.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/ALP-Micro-0.1-x86_64.license-CURRENT/ /var/lib/openqa/factory/repo/fixed/ALP-Micro-0.1-x86_64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-x86_64.license-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Micro:0.1//*images/local/000product:ALP-Micro-ftp-POOL**x86_64*/*Media1/ /var/lib/openqa/factory/repo/fixed/ALP-Micro-0.1-x86_64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/ALP-Micro-0.1-x86_64-CURRENT/ /var/lib/openqa/factory/repo/fixed/ALP-Micro-0.1-x86_64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-x86_64-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Micro:0.1//*images/local/000product:ALP-Micro-ftp-POOL**aarch64*/*Media1.license/ /var/lib/openqa/factory/repo/fixed/ALP-Micro-0.1-aarch64.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/ALP-Micro-0.1-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/fixed/ALP-Micro-0.1-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-aarch64.license-Build2.3
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Micro:0.1//*images/local/000product:ALP-Micro-ftp-POOL**aarch64*/*Media1/ /var/lib/openqa/factory/repo/fixed/ALP-Micro-0.1-aarch64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/fixed/ALP-Micro-0.1-aarch64-CURRENT/ /var/lib/openqa/factory/repo/fixed/ALP-Micro-0.1-aarch64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Micro-0.1-aarch64-Build2.3
Loading