Commit f0cf2bf
committed
Put the current ROBOT profile in the templates directory.
For now, when building the image, we download the ROBOT report profile
for the current version of ROBOT (the version used in the ODK) and put
it in /tools/robot_report_profile.txt. We do that so that we can check,
as part of the standard workflow, whether the custom profile that the
project may be using is not lacking any new tests that are available in
the current version of ROBOT (see #998).
Here, we simply move the location of the profile file within the image,
from
/tools/robot_report_profile.txt
to
/tools/templates/src/ontology/profile.txt
This does not change how the check mentioned above works (we just update
the path involved in that check), but this will have the benefit of
automatically installing the ROBOT profile when seeding a repository,
since the file is now within the template directory used by the seeding
system.
Therefore, we can remove the 'src/ontology/profile.txt' block from the
dynamic template pack (which needed to be manually updated by us
whenever we updated ROBOT -- something I don't think we have really been
doing).
But we do not want to _always_ install this profile.txt file in a seeded
repository -- we only need to do that when the use of a custom profile
is enabled in the configuration (that was the reason why the profile was
part of the dynamic template pack). To avoid installing the file when a
custom profile is _not_ enabled, we use the recently introduced
per-template policies system: we set the policy for the
'src/ontology/profile.txt' template to NEVER if a custom profile is not
enabled.
closes #9991 parent 6931c3f commit f0cf2bf
File tree
4 files changed
+9
-38
lines changed- docker/odklite
- odk
- template
- src/ontology
4 files changed
+9
-38
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| 49 | + | |
49 | 50 | | |
50 | | - | |
| 51 | + | |
51 | 52 | | |
52 | 53 | | |
53 | 54 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1147 | 1147 | | |
1148 | 1148 | | |
1149 | 1149 | | |
| 1150 | + | |
| 1151 | + | |
1150 | 1152 | | |
1151 | 1153 | | |
1152 | 1154 | | |
| |||
1223 | 1225 | | |
1224 | 1226 | | |
1225 | 1227 | | |
1226 | | - | |
| 1228 | + | |
| 1229 | + | |
| 1230 | + | |
| 1231 | + | |
1227 | 1232 | | |
1228 | 1233 | | |
1229 | 1234 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
692 | 692 | | |
693 | 693 | | |
694 | 694 | | |
695 | | - | |
696 | | - | |
697 | | - | |
698 | | - | |
699 | | - | |
700 | | - | |
701 | | - | |
702 | | - | |
703 | | - | |
704 | | - | |
705 | | - | |
706 | | - | |
707 | | - | |
708 | | - | |
709 | | - | |
710 | | - | |
711 | | - | |
712 | | - | |
713 | | - | |
714 | | - | |
715 | | - | |
716 | | - | |
717 | | - | |
718 | | - | |
719 | | - | |
720 | | - | |
721 | | - | |
722 | | - | |
723 | | - | |
724 | | - | |
725 | | - | |
726 | | - | |
727 | | - | |
728 | | - | |
729 | | - | |
730 | 695 | | |
731 | 696 | | |
732 | 697 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
364 | 364 | | |
365 | 365 | | |
366 | 366 | | |
367 | | - | |
| 367 | + | |
368 | 368 | | |
369 | 369 | | |
370 | 370 | | |
| |||
0 commit comments