Skip to content

Commit

Permalink
Use "rsync" instead of <scp> to copy files from Jeeves into Wooster
Browse files Browse the repository at this point in the history
See ukf-meta#439 for details
  • Loading branch information
Alejandro Perez committed Jun 25, 2024
1 parent 3211217 commit c9ec827
Showing 1 changed file with 30 additions and 20 deletions.
50 changes: 30 additions & 20 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2222,20 +2222,25 @@
</target>

<target name="fs.scp.unsigned.files.to.orchestrator">
<echo>SCPing unsigned files and stats file from output dir to orchestrator's build dir.</echo>
<scp failonerror="true" remoteTodir="${orchestrator.url}" port="${orchestrator.port}" keyfile="~/.ssh/id_rsa" knownhosts="~/.ssh/known_hosts">
<fileset dir="${output.dir}">
<include name="${mdaggr.prod.unsigned}"/>
<include name="${mdaggr.wayf.unsigned}"/>
<include name="${mdaggr.cdsall.unsigned}"/>
<include name="${mdaggr.test.unsigned}"/>
<include name="${mdaggr.back.unsigned}"/>
<include name="${mdaggr.export.unsigned}"/>
<include name="${mdaggr.export.preview.unsigned}"/>
<include name="${mdaggr.wugen.unsigned}"/>
<include name="${mdaggr.stats}"/>
</fileset>
</scp>
<echo>Copying unsigned files and stats file from output dir to orchestrator's build dir.</echo>
<exec executable="rsync" dir="${output.dir}" failonerror="true">
<arg value="-a"/>
<!-- use ssh with default identity and known_hosts -->
<arg value="-e"/>
<arg value="ssh -p ${orchestrator.port}"/>
<!-- the input files -->
<arg value="${mdaggr.prod.unsigned}"/>
<arg value="${mdaggr.wayf.unsigned}"/>
<arg value="${mdaggr.cdsall.unsigned}"/>
<arg value="${mdaggr.test.unsigned}"/>
<arg value="${mdaggr.back.unsigned}"/>
<arg value="${mdaggr.export.unsigned}"/>
<arg value="${mdaggr.export.preview.unsigned}"/>
<arg value="${mdaggr.wugen.unsigned}"/>
<arg value="${mdaggr.stats}"/>
<!-- remote directory must be last argument -->
<arg value="${orchestrator.url}"/>
</exec>
</target>

<target name="fs.scp.unsigned.files.to.keymaster">
Expand Down Expand Up @@ -2272,12 +2277,17 @@
</target>

<target name="fs.scp.mdqcache.to.repo">
<echo>SCPing mdq cache from orchestrator's build dir to a temp directory on repo.</echo>
<scp failonerror="true" remoteTodir="${repo.url}" keyfile="~/.ssh/id_rsa" knownhosts="~/.ssh/known_hosts">
<fileset dir="${output.dir}">
<include name="${mdq.cache}"/>
</fileset>
</scp>
<echo>Copying mdq cache from orchestrator's build dir to a temp directory on repo.</echo>
<exec executable="rsync" dir="${output.dir}" failonerror="true">
<arg value="-a"/>
<!-- use ssh with default identity and known_hosts -->
<arg value="-e"/>
<arg value="ssh"/>
<!-- the input files -->
<arg value="${mdq.cache}"/>
<!-- remote directory must be last argument -->
<arg value="${repo.url}"/>
</exec>
</target>

<target name="fs.scp.mdqcache.from.repo">
Expand Down

0 comments on commit c9ec827

Please sign in to comment.