Skip to content
This repository has been archived by the owner on Aug 7, 2024. It is now read-only.

Commit

Permalink
Use local config for artifactory
Browse files Browse the repository at this point in the history
  • Loading branch information
@timtebeek
timtebeek committed Dec 22, 2023
1 parent 058e66a commit 176059d
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions src/main/java/io/moderne/connect/commands/Jenkins.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ private String createConfigArtifactsCommand() {
if (downloadCLI || !StringUtils.isBlank(downloadCLIUrl)) {
command += isWindowsPlatform ? ".\\" : "./";
}
command += String.format("%s config artifacts artifactory edit --local=. %s--user=%s --password=%s %s --local .",
command += String.format("%s config artifacts artifactory edit --local=. %s--user=%s --password=%s %s ",
isWindowsPlatform ? "mod.exe" : "mod",
skipSSL ? "--skip-ssl " : "",
isWindowsPlatform ? "$env:ARTIFACTS_PUBLISH_CRED_USR" : "${ARTIFACTS_PUBLISH_CRED_USR}",
Expand All @@ -646,7 +646,7 @@ private String createConfigTenantCommand() {
if (downloadCLI || !StringUtils.isBlank(downloadCLIUrl)) {
command += isWindowsPlatform ? ".\\" : "./";
}
command += String.format("%s config moderne edit --token=%s %s --local .",
command += String.format("%s config moderne edit --token=%s %s ",
isWindowsPlatform ? "mod.exe" : "mod",
isWindowsPlatform ? "$env:MODERNE_TOKEN" : "${MODERNE_TOKEN}",
tenant.moderneUrl
Expand All @@ -665,7 +665,7 @@ private String createConfigMavenSettingsCommand() {
command += isWindowsPlatform ? ".\\" : "./";
}

return command + String.format("%s config build maven settings edit %s --local .",
return command + String.format("%s config build maven settings edit %s ",
isWindowsPlatform ? "mod.exe" : "mod",
isWindowsPlatform ? "$env:MODERNE_MVN_SETTINGS_XML" : "${MODERNE_MVN_SETTINGS_XML}");
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/jenkins/config-agent.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
<command>mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest --local .</command>
<command>mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
Expand Down
2 changes: 1 addition & 1 deletion src/test/jenkins/config-credentials.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
<command>mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest --local .</command>
<command>mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
Expand Down
6 changes: 3 additions & 3 deletions src/test/jenkins/config-freestyle-gradle-no-cleanup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
<command>./mod config moderne edit --token=${MODERNE_TOKEN} https://app.moderne.io --local .</command>
<command>./mod config moderne edit --token=${MODERNE_TOKEN} https://app.moderne.io </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
<command>./mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest --local .</command>
<command>./mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
<command>./mod config build maven settings edit ${MODERNE_MVN_SETTINGS_XML} --local .</command>
<command>./mod config build maven settings edit ${MODERNE_MVN_SETTINGS_XML} </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
Expand Down
2 changes: 1 addition & 1 deletion src/test/jenkins/config-freestyle-gradle-validate.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
<command>./mod config build maven settings edit ${MODERNE_MVN_SETTINGS_XML} --local .</command>
<command>./mod config build maven settings edit ${MODERNE_MVN_SETTINGS_XML} </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
Expand Down
6 changes: 3 additions & 3 deletions src/test/jenkins/config-freestyle-gradle.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
<command>./mod config moderne edit --token=${MODERNE_TOKEN} https://app.moderne.io --local .</command>
<command>./mod config moderne edit --token=${MODERNE_TOKEN} https://app.moderne.io </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
<command>./mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest --local .</command>
<command>./mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
<command>./mod config build maven settings edit ${MODERNE_MVN_SETTINGS_XML} --local .</command>
<command>./mod config build maven settings edit ${MODERNE_MVN_SETTINGS_XML} </command>
<configuredLocalRules/>
</hudson.tasks.Shell>

Expand Down
2 changes: 1 addition & 1 deletion src/test/jenkins/config-freestyle-maven-validate.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
<command>./mod config build maven settings edit ${MODERNE_MVN_SETTINGS_XML} --local .</command>
<command>./mod config build maven settings edit ${MODERNE_MVN_SETTINGS_XML} </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
Expand Down
6 changes: 3 additions & 3 deletions src/test/jenkins/config-freestyle-maven.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
<command>./mod config moderne edit --token=${MODERNE_TOKEN} https://app.moderne.io --local .</command>
<command>./mod config moderne edit --token=${MODERNE_TOKEN} https://app.moderne.io </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
<command>./mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest --local .</command>
<command>./mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
<command>./mod config build maven settings edit ${MODERNE_MVN_SETTINGS_XML} --local .</command>
<command>./mod config build maven settings edit ${MODERNE_MVN_SETTINGS_XML} </command>
<configuredLocalRules/>
</hudson.tasks.Shell>

Expand Down
2 changes: 1 addition & 1 deletion src/test/jenkins/config-no-cleanup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
<command>mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest --local .</command>
<command>mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
Expand Down
2 changes: 1 addition & 1 deletion src/test/jenkins/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
<command>mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest --local .</command>
<command>mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
Expand Down
2 changes: 1 addition & 1 deletion src/test/jenkins/rewrite-java-migration-config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
<command>mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest --local .</command>
<command>mod config artifacts artifactory edit --local=. --user=${ARTIFACTS_PUBLISH_CRED_USR} --password=${ARTIFACTS_PUBLISH_CRED_PWD} https://artifactory.moderne.ninja/artifactory/moderne-ingest </command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
Expand Down

0 comments on commit 176059d

Please sign in to comment.