Add crt file env var #152
Add crt file env var #152
Conversation
|
[test] |
| @@ -49,7 +49,16 @@ private Auth(Collection<X509Certificate> certs, TaskListener listener, | |||
| public static Auth createInstance(TaskListener listener, String apiURL, | |||
| Map<String, String> env) throws RuntimeException { | |||
| Auth auth = null; | |||
| File f = new File(CERT_FILE); | |||
| File f = null; | |||
| // first see if customer override cert file location | |||
| if (certFile != null && certFile.trim().length() > 0) { | ||
| f = new File(certFile.trim()); | ||
| } | ||
| // if did not override, or if provided bad value, use default |
There was a problem hiding this comment.
i'm not sold on falling back to the default if the file doesn't exist. at a minimum something needs to be logged if we do that.
There was a problem hiding this comment.
agreed ... pushing restructure momentarily
gabemontero
force-pushed
the
add-crt-file-env-var
branch
from
9c7664a to
6122479
Compare
|
response to comments pushed |
| @@ -320,7 +335,7 @@ public static String deriveBearerToken(String at, TaskListener listener, | |||
| * e.printStackTrace(listener.getLogger()); } } return deriveBearerToken(at, | |||
| * listener, verbose, vars, env); } | |||
| */ | |||
| public static String deriveCA(String ca, TaskListener listener, | |||
| /*public static String deriveCA(String ca, TaskListener listener, | |||
There was a problem hiding this comment.
what's w/ the commented out code?
There was a problem hiding this comment.
the method is at the moment not getting called .... but I decided to leave it in as a reference just in case it might be needed at some point
but i don't feel strongly about it, and can just delete if you prefer
There was a problem hiding this comment.
if you think it's a useful reference i'm fine w/ leaving it.
|
Evaluated for jenkins plugin test up to 6122479 |
|
lgtm |
|
continuous-integration/openshift-jenkins-plugin/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_jenkins_plugin/7/) (Base Commit: ddcc18a) (PR Branch Commit: 6122479) |
|
Hmm ... looks like we need to change the focus for the jenkins plugin ext test job. It is picking up a bunch of tests: The 12 tests we traditionally ran for this plugin passed: But then we get a bunch of Going to merge this based on our tests in question passing, and look into the plugin test job separately. |
|
might have been a victim of my recent refactor in this space: how is the test job invoking ginkgo? |
|
yeah probably is ... it is doing a |
|
all 4 plugins leverage a |
|
as long as they are setting FOCUS it should just keep working the way it was (unless I screwed something up) do you see this output? |
|
Here it is: |
|
And then right after the 12 tests we wanted run finish, we see this:
And that is when the failed tests, saying it is skipping, etc. happen. |
|
not clear to me what actually bombed the run, i don't think the skipping tests is the issue. It looks like it ran exactly 12 tests (in parallel) and no tests for serial. Where things failed is: Which seems like a question for @stevekuznetsov It is possible that running 0 tests in a suite confuses the junit gathering, but i don't think that's the issue. |
|
We're using <?xml version='1.0' encoding='UTF-8'?>
<flow-definition plugin="workflow-job@2.8">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
<io.fabric8.jenkins.openshiftsync.BuildConfigProjectProperty plugin="openshift-sync@0.1.1">
<uid></uid>
<namespace></namespace>
<name></name>
<resourceVersion></resourceVersion>
</io.fabric8.jenkins.openshiftsync.BuildConfigProjectProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.22">
<script>node{
openshiftBuild namespace: 'extended-test-jenkins-plugin-1sbd4-c3psz', bldCfg: 'frontend', buildName: 'frontend-1', showBuildLogs: 'false', verbose: 'true'
}</script>
<sandbox>true</sandbox>
</definition>
<triggers/>
</flow-definition> |
|
I'm not super familiar with the |
|
well this is what we're globbing:
i don't know what's normally in the dir to make the glob more specific. |
|
(that is in test/extended/setup.sh) |
|
incidentally that blob of code references that it is needed until jenkinsci/junit-plugin#54 is merged, but jenkinsci/junit-plugin#54 is merged. https://github.com/openshift/origin/blob/master/test/extended/setup.sh#L242-L255 so maybe we can just dump it? |
|
We can make "${TEST_REPORT_DIR}" more specific I guess |
|
@stevekuznetsov i only see it being set in one place and it's explicitly set to the artifact dir |
|
opened issue openshift/origin#15943 |
|
Right, I'm saying we should set it to a subdir so we can be more specific in the globbing |
Fixes #151
also universally formats all files, replacing tabs with spaces, in separate commit
@openshift/devex @dnguyen9 fyi