Update ca from 1.60 to 1.73 + Add debug info on ca repository #84
Conversation
| @@ -4,7 +4,7 @@ variable YUM_SNAPSHOT_NS ?= 'repository/snapshot'; | |||
|
|
|||
| @{ | |||
| desc = namespace of template associated with CA RPM YUM snapshot | |||
| values = string | |||
| values = string | |||
There was a problem hiding this comment.
done with --amend option
| # This work is licensed under the Creative Commons Attribution-Noncommercial | ||
| # 3.0 License. To view a copy of this license, visit | ||
| # 3.0 License. To view a copy of this license, visit |
There was a problem hiding this comment.
done with --amend option
guillaume-philippon
force-pushed
the
fix-ca
branch
from
3e07bee
to
2bebb01
Compare
| @@ -18,10 +18,13 @@ default = YUM_SNAPSHOT_DATE | |||
| required = no | |||
| } | |||
| variable YUM_CA_RPM_SNAPSHOT_DATE ?= if ( is_null(YUM_CA_RPM_SNAPSHOT_DATE) ) { | |||
There was a problem hiding this comment.
I don't follow this code. If YUM_CA_RPM_SNAPSHOT_DATE is not null or undef then this code will not run because of the ?= But if it is_null then you return SELF which will set it to undef. The addition of debug() statements seem to be a plaster over a block that should just be re-written to be less convoluted?
There was a problem hiding this comment.
I just add some debug info. I will have a deep look in the code itself.
There was a problem hiding this comment.
I fix the useless code part of the template
| @@ -37,8 +40,10 @@ include { 'quattor/functions/repository' }; | |||
|
|
|||
| '/software/repositories' = { | |||
| if ( is_defined(YUM_CA_RPM_SNAPSHOT_DATE) && (QUATTOR_RELEASE >= '14') ) { | |||
| debug(format('%s: adding CA repository for YUM snapshot %s',OBJECT,YUM_CA_RPM_SNAPSHOT_DATE)); | |||
| add_repositories(SECURITY_CA_RPM_REPOSITORY,YUM_CA_RPM_SNAPSHOT_NS); | |||
There was a problem hiding this comment.
This checks and logs YUM_CA_RPM_SNAPSHOT_DATE but then adds YUM_CA_RPM_SNAPSHOT_NS to the repositories tree. Why not check and log YUM_CA_RPM_SNAPSHOT_NS instead?
There was a problem hiding this comment.
YUM_CA_RPM_SNAPSHOT_NS is always defined. We must add this specific repository only if you use a QUATTOR_RELEASE >= '14' and SNAPSHOT_DATE is defined.
| # This work is licensed under the Creative Commons Attribution-Noncommercial | ||
| # 3.0 License. To view a copy of this license, visit | ||
| # http://creativecommons.org/licenses/by-nc/3.0/ | ||
| # Generated by ./builddist-egi.pl | ||
| # Generated by ./builddist-egi-multi.pl |
There was a problem hiding this comment.
Changes in this file are OK. If the addition of debug is controversial/needs discussion then perhaps it should be a separate commit to allow it to proceed without being blocked by the questions above?
There was a problem hiding this comment.
Note that this file is generated by an external body (IGTF) and is just imported by us from the reference repo.
|
@guillaume-philippon please could you rebase your PR so that we can include it in 16.10. |
|
I merged with upstream |
Every thing is on title