Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Enhance buildfile to support a different verification path for prepreod
Browse files Browse the repository at this point in the history 
Resolves InCommon#8
  • Loading branch information
Rhys Smith committed Aug 27, 2016
1 parent 17c28e0 commit 3ee10c8
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 22 deletions.
43 changes: 22 additions & 21 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@
<property name="md.dist.host1.name" value="md1.infr.ukfederation.org.uk"/>
<property name="md.dist.host2.name" value="md2.infr.ukfederation.org.uk"/>
<property name="md.dist.host3.name" value="md3.infr.ukfederation.org.uk"/>
<property name="md.dist.path.name" value="/"/>

<!--
Middlebox server properties.
Expand Down Expand Up @@ -1177,51 +1178,51 @@
property="mdaggr.export.preview.signed.checksum"/>

<echo>Verifying metadata held at ${md.dist.host1.name}</echo>
<VFY.remote.and.checksum i="http://${md.dist.host1.name}/${mdaggr.prod.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host1.name}${md.dist.path.name}${mdaggr.prod.signed}"
checksum="${mdaggr.prod.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host1.name}/${mdaggr.wayf.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host1.name}${md.dist.path.name}${mdaggr.wayf.signed}"
checksum="${mdaggr.wayf.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host1.name}/${mdaggr.cdsall.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host1.name}${md.dist.path.name}${mdaggr.cdsall.signed}"
checksum="${mdaggr.cdsall.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host1.name}/${mdaggr.test.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host1.name}${md.dist.path.name}${mdaggr.test.signed}"
checksum="${mdaggr.test.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host1.name}/${mdaggr.back.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host1.name}${md.dist.path.name}${mdaggr.back.signed}"
checksum="${mdaggr.back.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host1.name}/${mdaggr.export.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host1.name}${md.dist.path.name}${mdaggr.export.signed}"
checksum="${mdaggr.export.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host1.name}/${mdaggr.export.preview.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host1.name}${md.dist.path.name}${mdaggr.export.preview.signed}"
checksum="${mdaggr.export.preview.signed.checksum}"/>

<echo>Verifying metadata held at ${md.dist.host2.name}</echo>
<VFY.remote.and.checksum i="http://${md.dist.host2.name}/${mdaggr.prod.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host2.name}${md.dist.path.name}${mdaggr.prod.signed}"
checksum="${mdaggr.prod.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host2.name}/${mdaggr.wayf.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host2.name}${md.dist.path.name}${mdaggr.wayf.signed}"
checksum="${mdaggr.wayf.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host2.name}/${mdaggr.cdsall.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host2.name}${md.dist.path.name}${mdaggr.cdsall.signed}"
checksum="${mdaggr.cdsall.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host2.name}/${mdaggr.test.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host2.name}${md.dist.path.name}${mdaggr.test.signed}"
checksum="${mdaggr.test.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host2.name}/${mdaggr.back.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host2.name}${md.dist.path.name}${mdaggr.back.signed}"
checksum="${mdaggr.back.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host2.name}/${mdaggr.export.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host2.name}${md.dist.path.name}${mdaggr.export.signed}"
checksum="${mdaggr.export.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host2.name}/${mdaggr.export.preview.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host2.name}${md.dist.path.name}${mdaggr.export.preview.signed}"
checksum="${mdaggr.export.preview.signed.checksum}"/>

<echo>Verifying metadata held at ${md.dist.host3.name}</echo>
<VFY.remote.and.checksum i="http://${md.dist.host3.name}/${mdaggr.prod.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host3.name}${md.dist.path.name}${mdaggr.prod.signed}"
checksum="${mdaggr.prod.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host3.name}/${mdaggr.wayf.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host3.name}${md.dist.path.name}${mdaggr.wayf.signed}"
checksum="${mdaggr.wayf.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host3.name}/${mdaggr.cdsall.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host3.name}${md.dist.path.name}${mdaggr.cdsall.signed}"
checksum="${mdaggr.cdsall.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host3.name}/${mdaggr.test.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host3.name}${md.dist.path.name}${mdaggr.test.signed}"
checksum="${mdaggr.test.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host3.name}/${mdaggr.back.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host3.name}${md.dist.path.name}${mdaggr.back.signed}"
checksum="${mdaggr.back.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host3.name}/${mdaggr.export.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host3.name}${md.dist.path.name}${mdaggr.export.signed}"
checksum="${mdaggr.export.signed.checksum}"/>
<VFY.remote.and.checksum i="http://${md.dist.host3.name}/${mdaggr.export.preview.signed}"
<VFY.remote.and.checksum i="http://${md.dist.host3.name}${md.dist.path.name}${mdaggr.export.preview.signed}"
checksum="${mdaggr.export.preview.signed.checksum}"/>

<echo>Verification completed.</echo>
Expand Down
7 changes: 6 additions & 1 deletion preprod.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,9 @@ java.max.memory = 1536m
git.repo.group=ukf-test
git.repo.project.data=ukf-test-data
git.repo.project.products=ukf-test-products
git.repo.project.tooling=ukf-test-meta
git.repo.project.tooling=ukf-test-meta

#
# Preprod publishes its aggregates to /test/ instead of /
#
md.dist.path.name = /test/

0 comments on commit 3ee10c8

Please sign in to comment.