From cf6a9c4fd09b1a040a577981dea9bfbddffea454 Mon Sep 17 00:00:00 2001
From: Tucker Siegel <tgsiegel@umd.edu>
Date: Thu, 11 Nov 2021 12:56:41 -0800
Subject: [PATCH] update

---
 dawn-gateway/staging | 10 ++++++----
 dawn-gdd/staging     | 18 +++++++++++++-----
 dawn-user/staging    | 12 +++++++-----
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/dawn-gateway/staging b/dawn-gateway/staging
index 5b0bb60..66698f7 100644
--- a/dawn-gateway/staging
+++ b/dawn-gateway/staging
@@ -21,7 +21,7 @@ pipeline {
     stage('test') {
       steps {
         sh """
-            /home/tucker.siegel/bin/dawn-cli test
+            dawn-cli test
         """ 
       }
     }
@@ -29,16 +29,18 @@ pipeline {
     stage('build') {
       steps {
         sh """
-            /home/tucker.siegel/bin/dawn-cli build-image -p .
+            dawn-cli build-image -p .
         """ 
       }
     }
 
     stage('update backend services') {
       steps {
+        git branch: 'main',
+                credentialsId: 'tucker-gitlab-login',
+                url: 'https://gitlab.cs.umd.edu/dawn/go-backend/dawn-cli'
         sh """
-            cd /home/tucker.siegel/go/dawn-cli
-            /home/tucker.siegel/bin/dawn-cli deploy
+            dawn-cli deploy
         """ 
       }
     }
diff --git a/dawn-gdd/staging b/dawn-gdd/staging
index 22f87b5..f68f811 100644
--- a/dawn-gdd/staging
+++ b/dawn-gdd/staging
@@ -13,24 +13,32 @@ pipeline {
             git branch: 'staging',
                 credentialsId: 'tucker-gitlab-login',
                 url: 'https://gitlab.cs.umd.edu/dawn/go-backend/dawn-gdd.git'
-
-            sh "ls -lat"
         }
     }
      
+    // stage('test') {
+    //   steps {
+    //     sh """
+    //         dawn-cli test
+    //     """ 
+    //   }
+    // }
+
     stage('build') {
       steps {
         sh """
-            /home/tucker.siegel/bin/dawn-cli build-image -p .
+            dawn-cli build-image -p .
         """ 
       }
     }
 
     stage('update backend services') {
       steps {
+        git branch: 'main',
+                credentialsId: 'tucker-gitlab-login',
+                url: 'https://gitlab.cs.umd.edu/dawn/go-backend/dawn-cli'
         sh """
-            cd /home/tucker.siegel/go/dawn-cli
-            /home/tucker.siegel/bin/dawn-cli deploy     
+            dawn-cli deploy
         """ 
       }
     }
diff --git a/dawn-user/staging b/dawn-user/staging
index d21fd21..4dd1f46 100644
--- a/dawn-user/staging
+++ b/dawn-user/staging
@@ -8,7 +8,7 @@ pipeline {
   }
   stages {
       
-      stage('checkout') {
+  stage('checkout') {
         steps {
             git branch: 'staging',
                 credentialsId: 'tucker-gitlab-login',
@@ -21,7 +21,7 @@ pipeline {
     stage('test') {
       steps {
         sh """
-            /home/tucker.siegel/bin/dawn-cli test
+            dawn-cli test
         """ 
       }
     }
@@ -29,16 +29,18 @@ pipeline {
     stage('build') {
       steps {
         sh """
-            /home/tucker.siegel/bin/dawn-cli build-image -p .
+            dawn-cli build-image -p .
         """ 
       }
     }
 
     stage('update backend services') {
       steps {
+        git branch: 'main',
+                credentialsId: 'tucker-gitlab-login',
+                url: 'https://gitlab.cs.umd.edu/dawn/go-backend/dawn-cli'
         sh """
-            cd /home/tucker.siegel/go/dawn-cli
-            /home/tucker.siegel/bin/dawn-cli deploy
+            dawn-cli deploy
         """ 
       }
     }
-- 
GitLab