@@ -140,8 +140,8 @@ def pre_rsync_repo(repos):
140140 repoDest=$destPrefix-$buildid$destSuffix
141141 repoCur=$destPrefix-CURRENT$destSuffix
142142 [ -z "__STAGING" ] || repoCur=$destPrefix-__STAGING-CURRENT$destSuffix
143- echo "rsync --timeout=3600 -rtlp4 --delete --specials PRODUCTREPOPATH/$src/ /var/lib/openqa/factory/repo/$repoCur"
144- 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/"
143+ echo "rsync --timeout=3600 -rtlp4 --delete --specials PRODUCTREPOPATH/$src/ /var/lib/openqa/factory/repo/fixed/ $repoCur"
144+ 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/"
145145 done < <(grep $repo$additional_repo_suffix __envsub/files_repo.lst)
146146done
147147'''
@@ -172,8 +172,8 @@ def rsync_repodir2():
172172 dest=${dest//-Media2/}
173173 Mdia=Media2
174174 [[ ! $src =~ .*\.license ]] || Mdia=Media2.license
175- echo rsync --timeout=3600 -rtlp4 --delete --specials RSYNCFILTER PRODUCTREPOPATH/*$Mdia/ /var/lib/openqa/factory/repo/$dest-CURRENT-debuginfo/
176- 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
175+ echo rsync --timeout=3600 -rtlp4 --delete --specials RSYNCFILTER PRODUCTREPOPATH/*$Mdia/ /var/lib/openqa/factory/repo/fixed/ $dest-CURRENT-debuginfo/
176+ 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
177177 done < <(grep ${arch//i686/i586} __envsub/files_repo.lst | grep Media2 )
178178done
179179'''
@@ -183,21 +183,21 @@ def rsync_repomultiarch(destpath, debug, source):
183183 destpath = destpath .rstrip ("/" )
184184 dest = os .path .basename (destpath )
185185 res = '''
186- echo rsync --timeout=3600 -rtlp4 --delete --specials PRODUCTREPOPATH/''' + destpath + '''/ /var/lib/openqa/factory/repo/''' + dest + '''-CURRENT
187- 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/
186+ echo rsync --timeout=3600 -rtlp4 --delete --specials PRODUCTREPOPATH/''' + destpath + '''/ /var/lib/openqa/factory/repo/fixed/ ''' + dest + '''-CURRENT
187+ 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/
188188'''
189189
190190 if debug :
191191 debugfilter = "--include=" + debug + " --exclude={aarch64,armv7hl,i586,i686,noarch,nosrc,ppc64,ppc64le,riscv64,s390x,src,x86_64}/*"
192192 res = res + '''
193- echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + debugfilter + ''' PRODUCTREPOPATH/''' + destpath + '''-Debug/ /var/lib/openqa/factory/repo/''' + dest + '''-Debug-CURRENT/
194- 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/'''
193+ echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + debugfilter + ''' PRODUCTREPOPATH/''' + destpath + '''-Debug/ /var/lib/openqa/factory/repo/fixed/ ''' + dest + '''-Debug-CURRENT/
194+ 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/'''
195195
196196 if source :
197197 sourcefilter = "--include=" + source + " --exclude={aarch64,armv7hl,i586,i686,noarch,nosrc,ppc64,ppc64le,riscv64,s390x,src,x86_64}/*"
198198 res = res + '''
199- echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + sourcefilter + ''' PRODUCTREPOPATH/''' + destpath + '''-Source/ /var/lib/openqa/factory/repo/''' + dest + '''-Source-CURRENT/
200- 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/'''
199+ echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + sourcefilter + ''' PRODUCTREPOPATH/''' + destpath + '''-Source/ /var/lib/openqa/factory/repo/fixed/ ''' + dest + '''-Source-CURRENT/
200+ 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/'''
201201
202202 return res
203203
@@ -235,8 +235,8 @@ def rsync_repodir1_dest_media0(dest, debug, source, folder):
235235 if debug :
236236 xtra = "--include=" + debug + " --exclude={aarch64,armv7hl,i586,i686,noarch,nosrc,ppc64,ppc64le,riscv64,s390x,src,x86_64}/*"
237237 res = res + '''
238- echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + xtra + ''' PRODUCTREPOPATH/''' + folder + '''/$src/ /var/lib/openqa/factory/repo/$dest-CURRENT-Debug/
239- 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
238+ echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + xtra + ''' PRODUCTREPOPATH/''' + folder + '''/$src/ /var/lib/openqa/factory/repo/fixed/ $dest-CURRENT-Debug/
239+ 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
240240'''
241241 res = res + '''
242242 continue
@@ -249,17 +249,17 @@ def rsync_repodir1_dest_media0(dest, debug, source, folder):
249249 if source :
250250 xtra = "--include=" + source + " --exclude={aarch64,armv7hl,i586,i686,noarch,nosrc,ppc64,ppc64le,riscv64,s390x,src,x86_64}/*"
251251 res = res + '''
252- echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + xtra + ''' PRODUCTREPOPATH/''' + folder + '''/$src/ /var/lib/openqa/factory/repo/$dest-CURRENT-Source/
253- 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
252+ echo rsync --timeout=3600 -rtlp4 --delete --specials ''' + xtra + ''' PRODUCTREPOPATH/''' + folder + '''/$src/ /var/lib/openqa/factory/repo/fixed/ $dest-CURRENT-Source/
253+ 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
254254'''
255255 res = res + '''
256256 continue
257257 }
258258'''
259259
260260 res = res + '''
261- echo rsync --timeout=3600 -rtlp4 --delete --specials PRODUCTREPOPATH/''' + folder + '''/$src/ /var/lib/openqa/factory/repo/$dest-CURRENT/
262- 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
261+ echo rsync --timeout=3600 -rtlp4 --delete --specials PRODUCTREPOPATH/''' + folder + '''/$src/ /var/lib/openqa/factory/repo/fixed/ $dest-CURRENT/
262+ 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
263263 done < <(LANG=C.UTF-8 sort __envsub/files_repo_''' + repo + '''.lst )
264264# done
265265'''
0 commit comments