feat(1555): Pass in extra var UI URI to launcher (#28)

.gitignore

@@ -5,3 +5,4 @@ npm-debug.log
 .*.swp
 demo.js
 .nyc_output/
+package-lock.json

CONTRIBUTING.md

@@ -1,32 +1,3 @@
-# Contributing
+# Contributing to Screwdriver
 
-Thank you for considering contributing! There are many ways you can help.
-
-## Issues
-
-File an issue if you think you've found a bug. Be sure to describe
-
-1. How can it be reproduced?
-2. What did you expect?
-3. What actually occurred?
-4. Version, platform, etc. if possibly relevant.
-
-## Docs
-
-Documentation, READMEs, and examples are extremely important. Please help improve them and if you find a typo or notice a problem, please send a fix or say something.
-
-## Submitting Patches
-
-Patches for fixes, features, and improvements are accepted through pull requests.
-
-* Write good commit messages, in the present tense! (Add X, not Added X). Short title, blank line, bullet points if needed. Capitalize the first letter of the title or bullet item. No punctuation in the title.
-* Code must pass lint and style checks.
-* All external methods must be documented.
-* Include tests to improve coverage and prevent regressions.
-* Squash changes into a single commit per feature/fix. Ask if you're unsure how to discretize your work.
-
-Please ask before embarking on a large improvement so you're not disappointed if it does not align with the goals of the project or owner(s).
-
-## Feature Requests
-
-Make the case for a feature via an issue with a good title. The feature should be discussed and given a target inclusion milestone or closed.
+Have a look at our guidelines, as well as pointers on where to start making changes, in our official [documentation](https://docs.screwdriver.cd/about/contributing).

config/docker-compose.yml.tim

@@ -27,4 +27,4 @@ services:
       - "/bin/sh"
       - "-c"
       - |
-          /opt/sd/run.sh "{{token}}" "{{api_uri}}" "{{store_uri}}" "$SD_BUILD_TIMEOUT" "{{build_id}}"
+          /opt/sd/run.sh "{{token}}" "{{api_uri}}" "{{store_uri}}" "$SD_BUILD_TIMEOUT" "{{build_id}}" "{{ui_uri}}"

config/job.xml.tim

@@ -20,6 +20,11 @@
                     <description/>
                     <defaultValue/>
                 </hudson.model.TextParameterDefinition>
+                <hudson.model.TextParameterDefinition>
+                    <name>SD_UI</name>
+                    <description/>
+                    <defaultValue/>
+                </hudson.model.TextParameterDefinition>
                 <hudson.model.PasswordParameterDefinition>
                     <name>SD_TOKEN</name>
                     <description/>

index.js

@@ -166,7 +166,8 @@ class JenkinsExecutor extends Executor {
             memory: this.memory,
             memory_swap: this.memoryLimit,
             api_uri: this.ecosystem.api,
-            store_uri: this.ecosystem.store
+            store_uri: this.ecosystem.store,
+            ui_uri: this.ecosystem.ui
         };
 
         const templateFile = path.resolve(__dirname, './config/docker-compose.yml.tim');
@@ -209,6 +210,7 @@ class JenkinsExecutor extends Executor {
      * @param  {Object} options.ecosystem                              Screwdriver Ecosystem
      * @param  {Object} options.ecosystem.api                          Routable URI to Screwdriver API
      * @param  {Object} options.ecosystem.store                        Routable URI to Screwdriver Store
+     * @param  {Object} options.ecosystem.ui                           Routable URI to Screwdriver UI
      * @param  {String} options.jenkins.host                           Jenkins hostname to make requests to
      * @param  {Number} [options.jenkins.port=8080]                    Jenkins port to make requests to
      * @param  {String} [options.jenkins.username='screwdriver']       Jenkins username
@@ -292,6 +294,7 @@ class JenkinsExecutor extends Executor {
                     SD_CONTAINER: config.container,
                     SD_API: this.ecosystem.api,
                     SD_STORE: this.ecosystem.store,
+                    SD_UI: this.ecosystem.ui,
                     SD_BUILD_TIMEOUT: buildTimeout
                 }
             }]

package.json

@@ -36,7 +36,7 @@
     "chai": "^4.2.0",
     "eslint": "^4.19.0",
     "eslint-config-screwdriver": "^4.0.0",
-    "jenkins-mocha": "^6.0.0",
+    "jenkins-mocha": "^7.0.0",
     "mockery": "^2.0.0",
     "sinon": "^7.1.0"
   },

test/index.test.js

@@ -59,7 +59,7 @@ services:
       - "-c"
       - |
           /opt/sd/run.sh "{{token}}" "{{api_uri}}" `
-          + `"{{store_uri}}" "$SD_BUILD_TIMEOUT" "{{build_id}}"
+          + `"{{store_uri}}" "$SD_BUILD_TIMEOUT" "{{build_id}}" "{{ui_uri}}"
 `;
 
 describe('index', () => {
@@ -95,6 +95,7 @@ describe('index', () => {
         SD_CONTAINER: config.container,
         SD_API: ecosystem.api,
         SD_STORE: ecosystem.store,
+        SD_UI: ecosystem.ui,
         SD_BUILD_TIMEOUT: DEFAULT_BUILD_TIMEOUT
     };
 
@@ -519,7 +520,8 @@ describe('index', () => {
                     memory: '4g',
                     memory_swap: '6g',
                     api_uri: ecosystem.api,
-                    store_uri: ecosystem.store
+                    store_uri: ecosystem.store,
+                    ui_uri: ecosystem.ui
                 });
 
                 executor = new Executor({
@@ -594,7 +596,8 @@ rm -f docker-compose.yml
                     memory,
                     memory_swap: memoryLimit,
                     api_uri: ecosystem.api,
-                    store_uri: ecosystem.store
+                    store_uri: ecosystem.store,
+                    ui_uri: ecosystem.ui
                 });
 
                 const buildScriptTim = `