-
Notifications
You must be signed in to change notification settings - Fork 31
Generate build script within preprocessor #2172
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
Skipping CI for Draft Pull Request. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2172 +/- ##
============================================
+ Coverage 41.97% 42.04% +0.06%
- Complexity 793 798 +5
============================================
Files 286 286
Lines 13162 13151 -11
Branches 1388 1392 +4
============================================
+ Hits 5525 5529 +4
+ Misses 7006 6997 -9
+ Partials 631 625 -6 ☔ View full report in Codecov by Sentry. |
...cessor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java
Outdated
Show resolved
Hide resolved
...cessor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java
Outdated
Show resolved
Hide resolved
| </profile> | ||
| </profiles> | ||
| </settings> | ||
| EOF |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The settings.xml for Indy, I took FROM PNC and merged with your
<settings>
<mirrors>
<mirror>
<id>indy-mvn</id>
<mirrorOf>*</mirrorOf>
<url>
${MVN_REPO_DEPENDENCIES_URL}
</url>
</mirror>
</mirrors>
<servers>
<server>
<id>indy-mvn</id>
<configuration>
<connectionTimeout>60000</connectionTimeout>
<httpHeaders>
<property>
<name>Authorization</name>
<value>Bearer ${MVN_TOKEN}</value>
</property>
</httpHeaders>
</configuration>
</server>
</servers>
<proxies>
<proxy>
<id>indy-http</id>
<active>true</active>
<protocol>http</protocol>
<host>indy-generic-proxy</host>
<port>80</port>
<!-- <username>build-ADDTW3JAGHYAA+tracking</username> -->
<username>${BUILD_ID}+tracking</username>
<password>${MVN_TOKEN}</password>
<nonProxyHosts>indy|localhost</nonProxyHosts>
</proxy>
<proxy>
<id>indy-https</id>
<active>true</active>
<protocol>https</protocol>
<host>indy-generic-proxy</host>
<port>80</port>
<username>${BUILD_ID}+tracking</username>
<password>${MVN_TOKEN}</password>
<nonProxyHosts>indy|localhost</nonProxyHosts>
</proxy>
</proxies>
<profiles>
<profile>
<id>deployment</id>
<properties>
<altDeploymentRepository>
local::file:///var/workdir/workspace/artifacts
</altDeploymentRepository>
</properties>
</profile>
</profiles>
<activeProfiles>
<activeProfile>deployment</activeProfile>
</activeProfiles>
<interactiveMode>false</interactiveMode>
<localRepository>/tmp/.m2/repository</localRepository>
</settings>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would bake the ${MVN_REPO_DEPENDENCIES_URL} and ${BUILD_ID} in the OCI source image as that is required for the reproducibility and leave only ${MVN_TOKEN} (probably not the best name) configurable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need to discuss this; I'm not entirely sure I follow or what you're trying to modify?
I don't think the server needs to be configured here as its not deploying?
I'm not entirely sure about how the proxy section is used either.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think the server needs to be configured here as its not deploying?
I need to verify this, it might be we need auth for read operation from a per-build repo too
I'm not entirely sure about how the proxy section is used either.
this is a http proxy, used by the tools that are started by maven, eg. a maven task using wget.
Similar to maven there is an http "repo" (persistent cache) per build.
I believe this is all we need for a build using Indy, as I said it's a copy form PNC configured build, except the altDeploymentRepository
5ee554b to
fe13a1c
Compare
|
/retest |
…ol_version