Skip to content

enable plugin to overwrite profilename from job config as a parameter #2

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.

Sign up for GitHub

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

Open
wreggyl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

enable plugin to overwrite profilename from job config as a parameter #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,16 @@
</dependency>

</dependencies>

</project>


<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
</project>
8 changes: 6 additions & 2 deletions src/main/java/org/jenkinsci/plugins/sharedobjects/SharedObjectJobProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,12 @@ public SharedObjectType[] call() throws EnvInjectException {
restrictionActivated = false;
}

// find out if profile name is a job argument
Map<String, String> envVars = build.getEnvironment(listener);
String real_profile = Util.replaceMacro(profiles, envVars);

if (restrictionActivated) {
logger.info(String.format("Restricting shared objects to the following usage %s", profiles));
logger.info(String.format("Restricting shared objects to the following usage %s", real_profile));
}

for (SharedObjectType type : sharedObjectTypes) {
Expand All @@ -88,7 +92,7 @@ public SharedObjectType[] call() throws EnvInjectException {
addSharedObject(result, type, build, logger);
continue;
}
if (restrictionActivated && isProfileActivated(profiles, type)) {
if (restrictionActivated && isProfileActivated(real_profile, type)) {
addSharedObject(result, type, build, logger);
continue;
}
Expand Down