Skip to content
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

Jump to bottom

Refactored platform management Git URL into environment variable #41

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

Refactored platform management Git URL into environment variable #41

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
14 changes: 11 additions & 3 deletions bootstrap/Platform_Management/Load_Cartridge_List.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
// Constants
def platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management"

def platformToolsGitURL = null;

try{
platformToolsGitURL = "${ADOP_PLATFORM_MANAGEMENT_GIT_URL}"
}catch(MissingPropertyException exception){
// backwards compatible - default to gerrit.
platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management";
}

def platformManagementFolderName= "/Platform_Management"
def platformManagementFolder = folder(platformManagementFolderName) { displayName('Platform Management') }

// Jobs
def loadCartridgeJob = freeStyleJob(platformManagementFolderName + "/Load_Cartridge_List")

// Setup setup_cartridge
loadCartridgeJob.with{
wrappers {
Expand Down Expand Up @@ -70,4 +78,4 @@ done < ${WORKSPACE}/platform-management/cartridges.txt''')
relativeTargetDir('platform-management')
}
}
}
}
16 changes: 12 additions & 4 deletions bootstrap/Platform_Management/Setup_Gerrit.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
// Constants
def platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management"

def platformToolsGitURL = null;

try{
platformToolsGitURL = "${ADOP_PLATFORM_MANAGEMENT_GIT_URL}"
}catch(MissingPropertyException exception){
// backwards compatible - default to gerrit.
platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management";
}

def platformManagementFolderName= "/Platform_Management"
def platformManagementFolder = folder(platformManagementFolderName) { displayName('Platform Management') }

// Jobs
def setupGerritJob = freeStyleJob(platformManagementFolderName + "/Setup_Gerrit")

// Setup setup_gerrit
setupGerritJob.with{
wrappers {
Expand All @@ -19,7 +27,7 @@ setupGerritJob.with{
steps {
shell('''#!/bin/bash -ex

# Fetch All-Projects
# Fetch All-Projects
cd ${WORKSPACE}
git clone ssh://jenkins@gerrit:29418/All-Projects
cd ${WORKSPACE}/All-Projects
Expand Down Expand Up @@ -57,4 +65,4 @@ fi''')
relativeTargetDir('platform-management')
}
}
}
}
14 changes: 11 additions & 3 deletions bootstrap/Workspace_Management/Generate_Workspace.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
// Constants
def platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management"

def platformToolsGitURL = null;

try{
platformToolsGitURL = "${ADOP_PLATFORM_MANAGEMENT_GIT_URL}"
}catch(MissingPropertyException exception){
// backwards compatible - default to gerrit.
platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management";
}

def workspaceManagementFolderName= "/Workspace_Management"
def workspaceManagementFolder = folder(workspaceManagementFolderName) { displayName('Workspace Management') }

// Jobs
def generateWorkspaceJob = freeStyleJob(workspaceManagementFolderName + "/Generate_Workspace")

// Setup generateWorkspaceJob
generateWorkspaceJob.with{
parameters{
Expand Down Expand Up @@ -75,4 +83,4 @@ done''')
branch("*/master")
}
}
}
}
14 changes: 10 additions & 4 deletions projects/jobs/jobs.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
// Constants
def gerritBaseUrl = "ssh://jenkins@gerrit:29418"
def cartridgeBaseUrl = gerritBaseUrl + "/cartridges"
def platformToolsGitUrl = gerritBaseUrl + "/platform-management"

def platformToolsGitURL = null;

try{
platformToolsGitURL = "${ADOP_PLATFORM_MANAGEMENT_GIT_URL}"
}catch(MissingPropertyException exception){
// backwards compatible - default to gerrit.
platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management";
}

// Folders
def workspaceFolderName = "${WORKSPACE_NAME}"
Expand Down Expand Up @@ -275,7 +281,7 @@ def cartridgeFolder = folder(cartridgeFolderName) {
git {
remote {
name("origin")
url("${platformToolsGitUrl}")
url("${platformToolsGitURL}")
credentials("adop-jenkins-master")
}
branch("*/master")
Expand Down
10 changes: 9 additions & 1 deletion workspaces/jobs/jobs.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
// Constants
def platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management"

def platformToolsGitURL = null;

try{
platformToolsGitURL = "${ADOP_PLATFORM_MANAGEMENT_GIT_URL}"
}catch(MissingPropertyException exception){
// backwards compatible - default to gerrit.
platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management";
}

// Folders
def workspaceFolderName = "${WORKSPACE_NAME}"
Expand Down