From d923e7cd963b74d42c0e0c5174b60197cb09ead7 Mon Sep 17 00:00:00 2001
From: Clay Diffrient <cdiffrient@instructure.com>
Date: Fri, 6 Sep 2019 10:19:08 -0600
Subject: [PATCH] Fix some missed renaming spots in the Jenkinsfile

Test Plan:
  - New Jenkins frontend build passes

closes COREFE-266

flag = none

Change-Id: I711458c2f4367e2d8540fe234b7bdcb59dbe4b4f
Reviewed-on: https://gerrit.instructure.com/208485
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins
QA-Review: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
---
 Jenkinsfile.frontend                 | 24 ++++++++++++------------
 docker-compose.new-jenkins-karma.yml |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Jenkinsfile.frontend b/Jenkinsfile.frontend
index 435f19d2e8f..f217dcae316 100644
--- a/Jenkinsfile.frontend
+++ b/Jenkinsfile.frontend
@@ -37,7 +37,7 @@ pipeline {
   }
 
   environment {
-    COMPOSE_FILE = 'docker-compose.new-jenkins-js.yml'
+    COMPOSE_FILE = 'docker-compose.new-jenkins-web.yml'
     // 'refs/changes/63/181863/8' -> '63.181863.8'
     NAME = "${env.GERRIT_REFSPEC}".minus('refs/changes/').replaceAll('/','.')
     PATCHSET_TAG = "$DOCKER_REGISTRY_FQDN/jenkins/canvas-lms:$NAME"
@@ -52,24 +52,24 @@ pipeline {
       parallel {
         stage('ESLint - JSX') {
           steps {
-            sh 'build/new-jenkins/js/linter-eslint.sh'
+            sh 'build/new-jenkins/frontend/linter-eslint.sh'
           }
         }
         stage('Stylelint') {
           steps {
-            sh 'build/new-jenkins/js/linter-stylelint.sh'
+            sh 'build/new-jenkins/frontend/linter-stylelint.sh'
           }
         }
         stage('XSSLint') {
           steps {
-            sh 'build/new-jenkins/js/linter-xss.sh'
+            sh 'build/new-jenkins/frontend/linter-xss.sh'
           }
         }
       }
     }
     stage('Tests Setup') {
       environment {
-        COMPOSE_FILE = 'docker-compose.new-jenkins-js.yml:docker-compose.new-jenkins-karma.yml'
+        COMPOSE_FILE = 'docker-compose.new-jenkins-web.yml:docker-compose.new-jenkins-karma.yml'
       }
       steps {
         setDockerUp() 
@@ -77,17 +77,17 @@ pipeline {
     }  
     stage('Tests') {
       environment {
-        COMPOSE_FILE = 'docker-compose.new-jenkins-js.yml:docker-compose.new-jenkins-karma.yml'
+        COMPOSE_FILE = 'docker-compose.new-jenkins-web.yml:docker-compose.new-jenkins-karma.yml'
       }
       parallel {
         stage('Jest') {
           steps {
-            sh 'build/new-jenkins/js/tests-jest.sh'
+            sh 'build/new-jenkins/frontend/tests-jest.sh'
           }
         }
         stage('Packages') {
           steps {
-            sh 'build/new-jenkins/js/tests-packages.sh'
+            sh 'build/new-jenkins/frontend/tests-packages.sh'
           }
         }
         stage('Karma - Spec Group - coffee') {
@@ -95,7 +95,7 @@ pipeline {
             JSPEC_GROUP = 'coffee'
           }
           steps {
-            sh 'build/new-jenkins/js/tests-karma.sh'
+            sh 'build/new-jenkins/frontend/tests-karma.sh'
           }
         }
         stage('Karma - Spec Group - jsa - A-F') {
@@ -103,7 +103,7 @@ pipeline {
             JSPEC_GROUP = 'jsa'
           }
           steps {
-            sh 'build/new-jenkins/js/tests-karma.sh'
+            sh 'build/new-jenkins/frontend/tests-karma.sh'
           }
         }
         stage('Karma - Spec Group - jsg - G') {
@@ -111,7 +111,7 @@ pipeline {
             JSPEC_GROUP = 'jsg'
           }
           steps {
-            sh 'build/new-jenkins/js/tests-karma.sh'
+            sh 'build/new-jenkins/frontend/tests-karma.sh'
           }
         }
         stage('Karma - Spec Group - jsh - H-Z') {
@@ -119,7 +119,7 @@ pipeline {
             JSPEC_GROUP = 'jsh'
           }
           steps {
-            sh 'build/new-jenkins/js/tests-karma.sh'
+            sh 'build/new-jenkins/frontend/tests-karma.sh'
           }
         }
       }
diff --git a/docker-compose.new-jenkins-karma.yml b/docker-compose.new-jenkins-karma.yml
index f2b3fd06aaa..6e9430b2daf 100644
--- a/docker-compose.new-jenkins-karma.yml
+++ b/docker-compose.new-jenkins-karma.yml
@@ -5,6 +5,6 @@ services:
       - JSPEC_GROUP
     build:
       context: .
-      dockerfile: ./build/new-jenkins/js/Dockerfile-karma
+      dockerfile: ./build/new-jenkins/frontend/Dockerfile-karma
       args:
         image_name: $PATCHSET_TAG