Skip to content

Commit

Permalink
remove space param test again since we have 3.11 jenkins e2e working …
Browse files Browse the repository at this point in the history 
…again and haven't decided about bumping the version of client plugin in 3.11
  • Loading branch information
@gabemontero
gabemontero committed Jun 6, 2019
1 parent 0a35c53 commit 5fc10ff
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions examples/jenkins-image-sample.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,32 +128,32 @@ void actualTest() {*/
template.labels["mylabel"] = "myvalue"

// verify we can handle unquoted param values with spaces
def muser = "All Users"
openshift.process( template, '-p', "MONGODB_USER=${muser}")
def exist2 = openshift.selector("template", "grape-spring-boot").exists()
if (!exist2) {
openshift.create("https://raw.githubusercontent.com/openshift/jenkins-client-plugin/master/examples/issue184-template.yml")
}
def exist3 = openshift.selector("template", "postgresql-ephemeral").exists()
if (!exist3) {
openshift.create('https://raw.githubusercontent.com/openshift/origin/master/examples/db-templates/postgresql-ephemeral-template.json')
}
openshift.process("postgresql-ephemeral", "-p=MEMORY_LIMIT=120 -p=NAMESPACE=80 -p=DATABASE_SERVICE_NAME=\"-Xmx768m -Dmy.sys.param=aete\" -p=POSTGRESQL_USER=verify -p=POSTGRESQL_PASSWORD=aete -p=POSTGRESQL_DATABASE=400 -p=POSTGRESQL_VERSION=grape-regtest-tools-aete")
openshift.process("grape-spring-boot", "-p=LIVENESS_INITIAL_DELAY_SECONDS=120 -p=READYNESS_INITIAL_DELAY_SECONDS=80 -p=JVMARGS=\"-Xmx768m -Dmy.sys.param=aete\"-p=APPNAME=verify -p=DEPLOYMENTTAG=aete -p=ROLLING_TIMEOUT_SECONDS=400 -p=NAMESPACE=grape-regtest-tools-aete")
openshift.process("grape-spring-boot", "-p LIVENESS_INITIAL_DELAY_SECONDS=120 -p READYNESS_INITIAL_DELAY_SECONDS=80 -p JVMARGS=\"-Xmx768m -Dmy.sys.param=aete\"-p APPNAME=verify -p DEPLOYMENTTAG=aete -p ROLLING_TIMEOUT_SECONDS=400 -p NAMESPACE=grape-regtest-tools-aete")
openshift.process("grape-spring-boot", "-p=LIVENESS_INITIAL_DELAY_SECONDS=120", "-p=READYNESS_INITIAL_DELAY_SECONDS=80", "-p=JVMARGS=\"-Xmx768m -Dmy.sys.param=aete\"", "-p=APPNAME=verify", "-p=DEPLOYMENTTAG=aete", "-p=ROLLING_TIMEOUT_SECONDS=400", "-p=NAMESPACE=grape-regtest-tools-aete")
//def muser = "All Users"
//openshift.process( template, '-p', "MONGODB_USER=${muser}")
//def exist2 = openshift.selector("template", "grape-spring-boot").exists()
//if (!exist2) {
// openshift.create("https://raw.githubusercontent.com/openshift/jenkins-client-plugin/master/examples/issue184-template.yml")
//}
//def exist3 = openshift.selector("template", "postgresql-ephemeral").exists()
//if (!exist3) {
// openshift.create('https://raw.githubusercontent.com/openshift/origin/master/examples/db-templates/postgresql-ephemeral-template.json')
//}
//openshift.process("postgresql-ephemeral", "-p=MEMORY_LIMIT=120 -p=NAMESPACE=80 -p=DATABASE_SERVICE_NAME=\"-Xmx768m -Dmy.sys.param=aete\" -p=POSTGRESQL_USER=verify -p=POSTGRESQL_PASSWORD=aete -p=POSTGRESQL_DATABASE=400 -p=POSTGRESQL_VERSION=grape-regtest-tools-aete")
//openshift.process("grape-spring-boot", "-p=LIVENESS_INITIAL_DELAY_SECONDS=120 -p=READYNESS_INITIAL_DELAY_SECONDS=80 -p=JVMARGS=\"-Xmx768m -Dmy.sys.param=aete\"-p=APPNAME=verify -p=DEPLOYMENTTAG=aete -p=ROLLING_TIMEOUT_SECONDS=400 -p=NAMESPACE=grape-regtest-tools-aete")
//openshift.process("grape-spring-boot", "-p LIVENESS_INITIAL_DELAY_SECONDS=120 -p READYNESS_INITIAL_DELAY_SECONDS=80 -p JVMARGS=\"-Xmx768m -Dmy.sys.param=aete\"-p APPNAME=verify -p DEPLOYMENTTAG=aete -p ROLLING_TIMEOUT_SECONDS=400 -p NAMESPACE=grape-regtest-tools-aete")
//openshift.process("grape-spring-boot", "-p=LIVENESS_INITIAL_DELAY_SECONDS=120", "-p=READYNESS_INITIAL_DELAY_SECONDS=80", "-p=JVMARGS=\"-Xmx768m -Dmy.sys.param=aete\"", "-p=APPNAME=verify", "-p=DEPLOYMENTTAG=aete", "-p=ROLLING_TIMEOUT_SECONDS=400", "-p=NAMESPACE=grape-regtest-tools-aete")

// Process the modeled template. We could also pass JSON/YAML, a template name, or a url instead.
// note: -p option for oc process not in the oc version that we currently ship with openshift jenkins images
def objectModels = openshift.process( template )//, "-p", "MEMORY_LIMIT=600Mi")
//def objectModels = openshift.process( template )//, "-p", "MEMORY_LIMIT=600Mi")

// objectModels is a list of objects the template defined, modeled as Groovy objects
echo "The template references ${objectModels.size()} objects"
//echo "The template references ${objectModels.size()} objects"

// For fun, modify the objects that have been defined by processing the template
for ( o in objectModels ) {
o.metadata.labels[ "anotherlabel" ] = "anothervalue"
}
//for ( o in objectModels ) {
// o.metadata.labels[ "anotherlabel" ] = "anothervalue"
//}

def objects
def verb
Expand Down

0 comments on commit 5fc10ff

Please sign in to comment.