From e304d460342488cd8f24eb0ba04b74e4b630951a Mon Sep 17 00:00:00 2001
From: Robert Tisma <942951+rtisma@users.noreply.github.com>
Date: Thu, 15 Oct 2020 11:13:43 -0400
Subject: [PATCH 1/8] added overture-qa autodeploy

---
 Jenkinsfile.groovy | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index a93204d6..4420d20b 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -98,25 +98,25 @@ spec:
         }
         
 
-        //stage('Deploy to overture-qa') {
-            //when {
-                //branch "develop"
-            //}
-            //steps {
-                //container('helm') {
-                    //withCredentials([file(credentialsId:'4ed1e45c-b552-466b-8f86-729402993e3b', variable: 'KUBECONFIG')]) {
-                        //sh 'env'
-                        //sh 'helm init --client-only'
-                        //sh "helm ls --kubeconfig $KUBECONFIG"
-                        //sh "helm repo add overture https://overture-stack.github.io/charts-server/"
-                        //sh """
-                            //helm upgrade --kubeconfig $KUBECONFIG --install --namespace=overture-qa ego \\
-                            //overture/ego --reuse-values --set-string image.tag=${version}-${commit}
-                           //"""
-                    //}
-                //}
-            //}
-        //}
+		stage('Deploy to overture-qa') {
+			when {
+				branch "test-develop"
+			}
+			steps {
+				container('helm') {
+					withCredentials([file(credentialsId:'4ed1e45c-b552-466b-8f86-729402993e3b', variable: 'KUBECONFIG')]) {
+						sh 'env'
+						sh 'helm init --client-only'
+						sh "helm ls --kubeconfig $KUBECONFIG"
+						sh "helm repo add overture https://overture-stack.github.io/charts-server/"
+						sh """
+							helm upgrade --kubeconfig $KUBECONFIG --install --namespace=overture-qa dms-ui \\
+							overture/dms-ui --reuse-values --set-string image.tag=${version}-${commit}
+						   """
+					}
+				}
+			}
+		}
 
         //stage('Deploy to overture-staging') {
             //when {

From 2c1e1ef8b3e5a9d619ffd00d7ee9923d8bcf17ee Mon Sep 17 00:00:00 2001
From: Robert Tisma <942951+rtisma@users.noreply.github.com>
Date: Thu, 15 Oct 2020 11:17:57 -0400
Subject: [PATCH 2/8] updated

---
 Jenkinsfile.groovy | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 4420d20b..25829342 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -106,7 +106,6 @@ spec:
 				container('helm') {
 					withCredentials([file(credentialsId:'4ed1e45c-b552-466b-8f86-729402993e3b', variable: 'KUBECONFIG')]) {
 						sh 'env'
-						sh 'helm init --client-only'
 						sh "helm ls --kubeconfig $KUBECONFIG"
 						sh "helm repo add overture https://overture-stack.github.io/charts-server/"
 						sh """

From 79223a6e095c24f60b052ec4bbeba12929ad4bbe Mon Sep 17 00:00:00 2001
From: Robert Tisma <942951+rtisma@users.noreply.github.com>
Date: Fri, 16 Oct 2020 11:56:52 -0400
Subject: [PATCH 3/8] test

---
 Jenkinsfile.groovy | 106 ++++++++++++++++++++++-----------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 25829342..14c25e0a 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -46,57 +46,57 @@ spec:
             }
         }
 
-		stage('Test') {
-			steps {
-				container('node') {
-					sh "npm ci"
-					sh "npm run test"
-				}
-			}
-		}
-
-        stage('Build & Publish Develop') {
-            when {
-                anyOf {
-                    branch 'develop'
-                }
-            }
-            steps {
-                container('docker') {
-                    withCredentials([usernamePassword(credentialsId:'OvertureDockerHub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-                        sh 'docker login -u $USERNAME -p $PASSWORD'
-                    }
-                    // DNS error if --network is default
-                    sh "docker build --network=host -f Dockerfile . -t ${dockerHubRepo}:${version}-${commit} -t ${dockerHubRepo}:edge"
-                    sh "docker push ${dockerHubRepo}:${version}-${commit}"
-                    sh "docker push ${dockerHubRepo}:edge"
-                }
-            }
-        }
-
-        stage('Release & Tag') {
-            when {
-                anyOf {
-                    branch 'master'
-                }
-            }
-            steps {
-                container('docker') {
-                    withCredentials([usernamePassword(credentialsId: 'OvertureBioGithub', passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {
-                        sh "git tag ${version}"
-                        sh "git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${githubRepo} --tags"
-                    }
-                    withCredentials([usernamePassword(credentialsId:'OvertureDockerHub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-                        sh 'docker login -u $USERNAME -p $PASSWORD'
-                    }
-                    // DNS error if --network is default
-                    sh "docker build --network=host -f Dockerfile . -t ${dockerHubRepo}:${version} -t ${dockerHubRepo}:latest"
-                    sh "docker push ${dockerHubRepo}:${version}"
-                    sh "docker push ${dockerHubRepo}:latest"
-                }
-            }
-        }
-        
+//		stage('Test') {
+//			steps {
+//				container('node') {
+//					sh "npm ci"
+//					sh "npm run test"
+//				}
+//			}
+//		}
+//
+//        stage('Build & Publish Develop') {
+//            when {
+//                anyOf {
+//                    branch 'develop'
+//                }
+//            }
+//            steps {
+//                container('docker') {
+//                    withCredentials([usernamePassword(credentialsId:'OvertureDockerHub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+//                        sh 'docker login -u $USERNAME -p $PASSWORD'
+//                    }
+//                    // DNS error if --network is default
+//                    sh "docker build --network=host -f Dockerfile . -t ${dockerHubRepo}:${version}-${commit} -t ${dockerHubRepo}:edge"
+//                    sh "docker push ${dockerHubRepo}:${version}-${commit}"
+//                    sh "docker push ${dockerHubRepo}:edge"
+//                }
+//            }
+//        }
+//
+//        stage('Release & Tag') {
+//            when {
+//                anyOf {
+//                    branch 'master'
+//                }
+//            }
+//            steps {
+//                container('docker') {
+//                    withCredentials([usernamePassword(credentialsId: 'OvertureBioGithub', passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {
+//                        sh "git tag ${version}"
+//                        sh "git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${githubRepo} --tags"
+//                    }
+//                    withCredentials([usernamePassword(credentialsId:'OvertureDockerHub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+//                        sh 'docker login -u $USERNAME -p $PASSWORD'
+//                    }
+//                    // DNS error if --network is default
+//                    sh "docker build --network=host -f Dockerfile . -t ${dockerHubRepo}:${version} -t ${dockerHubRepo}:latest"
+//                    sh "docker push ${dockerHubRepo}:${version}"
+//                    sh "docker push ${dockerHubRepo}:latest"
+//                }
+//            }
+//        }
+//        
 
 		stage('Deploy to overture-qa') {
 			when {
@@ -106,10 +106,10 @@ spec:
 				container('helm') {
 					withCredentials([file(credentialsId:'4ed1e45c-b552-466b-8f86-729402993e3b', variable: 'KUBECONFIG')]) {
 						sh 'env'
-						sh "helm ls --kubeconfig $KUBECONFIG"
+						sh "helm list"
 						sh "helm repo add overture https://overture-stack.github.io/charts-server/"
 						sh """
-							helm upgrade --kubeconfig $KUBECONFIG --install --namespace=overture-qa dms-ui \\
+							helm upgrade --install --namespace=overture-qa dms-ui \\
 							overture/dms-ui --reuse-values --set-string image.tag=${version}-${commit}
 						   """
 					}

From 280ccc1f46dd59b7a10a65d6207d9e332e91fe6d Mon Sep 17 00:00:00 2001
From: Robert Tisma <942951+rtisma@users.noreply.github.com>
Date: Mon, 19 Oct 2020 09:47:30 -0400
Subject: [PATCH 4/8] updated

---
 Jenkinsfile.groovy | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 14c25e0a..f18ccd42 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -103,17 +103,15 @@ spec:
 				branch "test-develop"
 			}
 			steps {
-				container('helm') {
-					withCredentials([file(credentialsId:'4ed1e45c-b552-466b-8f86-729402993e3b', variable: 'KUBECONFIG')]) {
-						sh 'env'
-						sh "helm list"
-						sh "helm repo add overture https://overture-stack.github.io/charts-server/"
-						sh """
-							helm upgrade --install --namespace=overture-qa dms-ui \\
-							overture/dms-ui --reuse-values --set-string image.tag=${version}-${commit}
-						   """
-					}
-				}
+				build(job: "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/provision/helm", parameters: [
+						[$class: 'StringParameterValue', name: 'OVERTURE_ENV', value: 'qa' ],
+						[$class: 'StringParameterValue', name: 'OVERTURE_CHART_NAME', value: 'dms-ui'],
+						[$class: 'StringParameterValue', name: 'OVERTURE_RELEASE_NAME', value: 'dms-ui'],
+						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_REPO_URL', value: "https://overture-stack.github.io/charts-server/"],
+						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_CHART_VERSION', value: "${chartVersion}"],
+						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_CHART_VERSION', value: "${chartVersion}"],
+						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_REUSE_VALUES', value: "false" ]
+				])
 			}
 		}
 

From 19c4bfde30cd2b6de8aa2d0ca77bf1398f07e82a Mon Sep 17 00:00:00 2001
From: Robert Tisma <942951+rtisma@users.noreply.github.com>
Date: Mon, 19 Oct 2020 09:50:43 -0400
Subject: [PATCH 5/8] updated

---
 Jenkinsfile.groovy | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index f18ccd42..5af4241d 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -108,8 +108,6 @@ spec:
 						[$class: 'StringParameterValue', name: 'OVERTURE_CHART_NAME', value: 'dms-ui'],
 						[$class: 'StringParameterValue', name: 'OVERTURE_RELEASE_NAME', value: 'dms-ui'],
 						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_REPO_URL', value: "https://overture-stack.github.io/charts-server/"],
-						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_CHART_VERSION', value: "${chartVersion}"],
-						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_CHART_VERSION', value: "${chartVersion}"],
 						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_REUSE_VALUES', value: "false" ]
 				])
 			}

From a6558df61732d4c128e7b074649d6a63ff901dba Mon Sep 17 00:00:00 2001
From: Robert Tisma <942951+rtisma@users.noreply.github.com>
Date: Mon, 19 Oct 2020 10:34:44 -0400
Subject: [PATCH 6/8] updated

---
 Jenkinsfile.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 5af4241d..12b7915b 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -103,7 +103,7 @@ spec:
 				branch "test-develop"
 			}
 			steps {
-				build(job: "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/provision/helm", parameters: [
+				build(job: "/Overture.bio/provision/helm", parameters: [
 						[$class: 'StringParameterValue', name: 'OVERTURE_ENV', value: 'qa' ],
 						[$class: 'StringParameterValue', name: 'OVERTURE_CHART_NAME', value: 'dms-ui'],
 						[$class: 'StringParameterValue', name: 'OVERTURE_RELEASE_NAME', value: 'dms-ui'],

From 453f60a37505f44d5fd293205def5ba43d1066b0 Mon Sep 17 00:00:00 2001
From: Robert Tisma <942951+rtisma@users.noreply.github.com>
Date: Mon, 19 Oct 2020 10:59:07 -0400
Subject: [PATCH 7/8] updated

---
 Jenkinsfile.groovy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 12b7915b..29fa4b10 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -107,6 +107,7 @@ spec:
 						[$class: 'StringParameterValue', name: 'OVERTURE_ENV', value: 'qa' ],
 						[$class: 'StringParameterValue', name: 'OVERTURE_CHART_NAME', value: 'dms-ui'],
 						[$class: 'StringParameterValue', name: 'OVERTURE_RELEASE_NAME', value: 'dms-ui'],
+						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_CHART_VERSION', value: ''], // use latest
 						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_REPO_URL', value: "https://overture-stack.github.io/charts-server/"],
 						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_REUSE_VALUES', value: "false" ]
 				])

From 949ad0bf83082d38d0fc24e4636eaf97eeafa1ed Mon Sep 17 00:00:00 2001
From: Robert Tisma <942951+rtisma@users.noreply.github.com>
Date: Mon, 19 Oct 2020 11:28:40 -0400
Subject: [PATCH 8/8] updated

---
 Jenkinsfile.groovy | 139 ++++++++++++++++++++++-----------------------
 1 file changed, 68 insertions(+), 71 deletions(-)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 29fa4b10..74d1856a 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -46,61 +46,61 @@ spec:
             }
         }
 
-//		stage('Test') {
-//			steps {
-//				container('node') {
-//					sh "npm ci"
-//					sh "npm run test"
-//				}
-//			}
-//		}
-//
-//        stage('Build & Publish Develop') {
-//            when {
-//                anyOf {
-//                    branch 'develop'
-//                }
-//            }
-//            steps {
-//                container('docker') {
-//                    withCredentials([usernamePassword(credentialsId:'OvertureDockerHub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-//                        sh 'docker login -u $USERNAME -p $PASSWORD'
-//                    }
-//                    // DNS error if --network is default
-//                    sh "docker build --network=host -f Dockerfile . -t ${dockerHubRepo}:${version}-${commit} -t ${dockerHubRepo}:edge"
-//                    sh "docker push ${dockerHubRepo}:${version}-${commit}"
-//                    sh "docker push ${dockerHubRepo}:edge"
-//                }
-//            }
-//        }
-//
-//        stage('Release & Tag') {
-//            when {
-//                anyOf {
-//                    branch 'master'
-//                }
-//            }
-//            steps {
-//                container('docker') {
-//                    withCredentials([usernamePassword(credentialsId: 'OvertureBioGithub', passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {
-//                        sh "git tag ${version}"
-//                        sh "git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${githubRepo} --tags"
-//                    }
-//                    withCredentials([usernamePassword(credentialsId:'OvertureDockerHub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-//                        sh 'docker login -u $USERNAME -p $PASSWORD'
-//                    }
-//                    // DNS error if --network is default
-//                    sh "docker build --network=host -f Dockerfile . -t ${dockerHubRepo}:${version} -t ${dockerHubRepo}:latest"
-//                    sh "docker push ${dockerHubRepo}:${version}"
-//                    sh "docker push ${dockerHubRepo}:latest"
-//                }
-//            }
-//        }
-//        
+		stage('Test') {
+			steps {
+				container('node') {
+					sh "npm ci"
+					sh "npm run test"
+				}
+			}
+		}
+
+		stage('Build & Publish Develop') {
+			when {
+				anyOf {
+					branch 'develop'
+				}
+			}
+			steps {
+				container('docker') {
+					withCredentials([usernamePassword(credentialsId:'OvertureDockerHub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+						sh 'docker login -u $USERNAME -p $PASSWORD'
+					}
+					// DNS error if --network is default
+					sh "docker build --network=host -f Dockerfile . -t ${dockerHubRepo}:${version}-${commit} -t ${dockerHubRepo}:edge"
+					sh "docker push ${dockerHubRepo}:${version}-${commit}"
+					sh "docker push ${dockerHubRepo}:edge"
+				}
+			}
+		}
+
+		stage('Release & Tag') {
+			when {
+				anyOf {
+					branch 'master'
+				}
+			}
+			steps {
+				container('docker') {
+					withCredentials([usernamePassword(credentialsId: 'OvertureBioGithub', passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {
+						sh "git tag ${version}"
+						sh "git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${githubRepo} --tags"
+					}
+					withCredentials([usernamePassword(credentialsId:'OvertureDockerHub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+						sh 'docker login -u $USERNAME -p $PASSWORD'
+					}
+					// DNS error if --network is default
+					sh "docker build --network=host -f Dockerfile . -t ${dockerHubRepo}:${version} -t ${dockerHubRepo}:latest"
+					sh "docker push ${dockerHubRepo}:${version}"
+					sh "docker push ${dockerHubRepo}:latest"
+				}
+			}
+		}
+		
 
 		stage('Deploy to overture-qa') {
 			when {
-				branch "test-develop"
+				branch "develop"
 			}
 			steps {
 				build(job: "/Overture.bio/provision/helm", parameters: [
@@ -114,25 +114,22 @@ spec:
 			}
 		}
 
-        //stage('Deploy to overture-staging') {
-            //when {
-                //branch "master"
-            //}
-            //steps {
-                //container('helm') {
-                    //withCredentials([file(credentialsId:'4ed1e45c-b552-466b-8f86-729402993e3b', variable: 'KUBECONFIG')]) {
-                        //sh 'env'
-                        //sh 'helm init --client-only'
-                        //sh "helm ls --kubeconfig $KUBECONFIG"
-                        //sh "helm repo add overture https://overture-stack.github.io/charts-server/"
-                        //sh """
-                            //helm upgrade --kubeconfig $KUBECONFIG --install --namespace=overture-qa ego \\
-                            //overture/ego --reuse-values --set-string image.tag=${version}
-                           //"""
-                    //}
-                //}
-            //}
-        //}
+		stage('Deploy to overture-staging') {
+			when {
+				branch "master"
+			}
+			steps {
+				build(job: "/Overture.bio/provision/helm", parameters: [
+						[$class: 'StringParameterValue', name: 'OVERTURE_ENV', value: 'staging' ],
+						[$class: 'StringParameterValue', name: 'OVERTURE_CHART_NAME', value: 'dms-ui'],
+						[$class: 'StringParameterValue', name: 'OVERTURE_RELEASE_NAME', value: 'dms-ui'],
+						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_CHART_VERSION', value: ''], // use latest
+						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_REPO_URL', value: "https://overture-stack.github.io/charts-server/"],
+						[$class: 'StringParameterValue', name: 'OVERTURE_HELM_REUSE_VALUES', value: "false" ]
+				])
+			}
+		}
+
     }
     post {
         unsuccessful {