From 8bf5e1fd236c430f80afd8350359db9a8368875b Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Wed, 1 May 2019 13:04:31 -0700
Subject: [PATCH] More attempts to artifactory publish

---
 concourse/pipeline.yml                        | 24 ++++++++++++-------
 concourse/tasks/atom-language-servers-test.sh |  3 +--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 323f97f60..f6b7a9e23 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -88,7 +88,7 @@ resources:
     access_key_id: ((s3_accesskey))
     secret_access_key: ((s3_secretkey))
     region_name: ((s3_region))
-    regexp: sts4/snapshots/headless-maven-out-(.*).vsix
+    regexp: sts4/snapshots/headless-maven-out-(.*).tar.gz
 - name: s3-concourse-vsix-snapshot
   type: s3
   source:
@@ -1284,12 +1284,6 @@ jobs:
       - put: s3-headless-maven-out
         params:
           file: out/headless-maven-out-*.tar.gz
-      - put: artifactory
-        params:
-          debug: true
-          build_uri: "https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_ID}"
-          repo: libs-snapshot-local
-          folder: maven-out
       - put: s3-manifest-yaml-fatjar-snapshot
         params:
           file: out/manifest-yaml-language-server-*.jar
@@ -1305,7 +1299,19 @@ jobs:
       - put: s3-spring-boot-fatjar-snapshot
         params:
           file: out/spring-boot-language-server-*.jar
-          acl: public-read          
+          acl: public-read
+- name: publish-headless-snapshots
+  plan:
+  - get: s3-headless-maven-out
+    passed:
+    - build-fatjars
+  - put: artifactory
+    params:
+      debug: true
+      build_uri: "https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_ID}"
+      repo: libs-snapshot-local
+      folder: s3-headless-maven-out
+      exclude: "**/_remote.repositories"
 - name: build-manifest-yaml-atom-package
   serial: true
   plan:
@@ -1313,7 +1319,6 @@ jobs:
     - get: sts4
       passed:
       - build-fatjars
-  
     - get: atom-cf-manifest-yaml
     - get: s3-manifest-yaml-fatjar-snapshot
       trigger: true
@@ -1516,6 +1521,7 @@ groups:
 - name: artifactory
   jobs:
   - build-fatjars
+  - publish-headless-snapshots
 - name: npm-packages
   jobs:
   - publish-jvm-launch-utils
diff --git a/concourse/tasks/atom-language-servers-test.sh b/concourse/tasks/atom-language-servers-test.sh
index 2a3c71d30..92203c4c2 100755
--- a/concourse/tasks/atom-language-servers-test.sh
+++ b/concourse/tasks/atom-language-servers-test.sh
@@ -30,8 +30,7 @@ ls -la $output
 
 mkdir -p ${maven_out}/org/springframework
 cp -R ~/.m2/repository/org/springframework/ide ${maven_out}/org/springframework
-tar cvf -C ${HOME}
 
 timestamp=`date +%s`
 tarfile=${output}/headless-maven-out-${timestamp}.tar.gz
-tar -czvf ${tarfile} ${maven_out}
+tar -czvf ${tarfile} -C ${maven_out} ${maven_out}