Merge pull request #4388 from devgateway/fix/GGW-for-merge-latest

Fix/ggw for merge latest

Author: jdeanquin-dg

Diff for: .DS_Store

@@ -59,18 +59,17 @@ stage('Build') {
         milestone()
     }
 
-    println "Using environment: ${environment}"
 
+    println "Using environment: ${environment}"
     node('ansible') {
         checkout scm
 
-
         // Find AMP version
         codeVersion = readMavenPom(file: 'amp/pom.xml').version
         println "AMP Version: ${codeVersion}"
         //Used in the initial generation of keys when working with a new jenkins instance
         //****************************************************************
-//        sh "ssh-keygen -t rsa -b 4096 -C 'jenkins@${environment}' -f ~/.ssh/id_rsa -N '' -y"
+//        sh "ssh-keygen -t rsa -b 4096 -C 'jenkins@${environment}' -f ~/.ssh/id_rsa -N ''"
         sh "ssh-keyscan -H ${environment} >> ~/.ssh/known_hosts"
 //        sh "cat /root/.ssh/id_rsa.pub"
         //******************************************************
@@ -106,7 +105,6 @@ stage('Build') {
 
         def image = "${dockerRepo}amp/webapp:${tag}"
         def hash = sh(returnStdout: true, script: "git log --pretty=%H -n 1").trim()
-
         docker.withRegistry("https://798366298150.dkr.ecr.us-east-1.amazonaws.com", "ecr:us-east-1:aws-ecr-credentials-id") {
             try {
                 updateGitHubCommitStatus('jenkins/build', 'Build in progress', 'PENDING')

Diff for: Jenkinsfile

@@ -89,5 +89,14 @@
 				<arguments>1.0-name-matches-false-false-*.class</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1715019593711</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>