Improve pipeline (#367)

* Improve pipeline * Fixup
fauna · Oct 26, 2023 · 85c3a5b · 85c3a5b
1 parent 2513011
commit 85c3a5b
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ target/
 target-android/
 .bsp
 *.iml
+*~
diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
@@ -27,60 +27,72 @@ resources:
       private_key: ((github_repo_key))
 
 jobs:
+  - name: set-self
+    serial: true
+    plan:
+      - get: fauna-jvm-repository
+        trigger: true
+      - get: fauna-jvm-repository-docs
+        trigger: true
+      - set_pipeline: self
+        file: fauna-jvm-repository/concourse/pipeline.yml
   - name: release
     serial: true
     public: false
     plan:
       - get: fauna-jvm-repository
+        passed: [set-self]
       - get: fauna-jvm-repository-docs
+        passed: [set-self]
 
-      - task: integration-tests-oracle-jdk11-scala-2-11
-        file: fauna-jvm-repository/concourse/tasks/integration-tests-oracle-jdk11-scala-2-11.yml
-        privileged: true
-        vars:
-          aws_access_key_id: ((concourse_aws_access_key_id))
-          aws_secret_access_key: ((concourse_aws_access_key_secret))
-        params:
-          FAUNA_ROOT_KEY: ((fauna.secret))
-          FAUNA_DOMAIN: ((fauna.domain))
-          FAUNA_SCHEME: ((fauna.scheme))
-          FAUNA_PORT: ((fauna.port))
-          AWS_ACCESS_KEY_ID: ((concourse_aws_access_key_id))
-          AWS_SECRET_ACCESS_KEY: ((concourse_aws_access_key_secret))
-          AWS_DEFAULT_REGION: us-east-2
-
-      - task: integration-tests-oracle-jdk11-scala-2-12
-        file: fauna-jvm-repository/concourse/tasks/integration-tests-oracle-jdk11-scala-2-12.yml
-        privileged: true
-        vars:
-          aws_access_key_id: ((concourse_aws_access_key_id))
-          aws_secret_access_key: ((concourse_aws_access_key_secret))
-        params:
-          FAUNA_ROOT_KEY: ((fauna.secret))
-          FAUNA_DOMAIN: ((fauna.domain))
-          FAUNA_SCHEME: ((fauna.scheme))
-          FAUNA_PORT: ((fauna.port))
-          AWS_ACCESS_KEY_ID: ((concourse_aws_access_key_id))
-          AWS_SECRET_ACCESS_KEY: ((concourse_aws_access_key_secret))
-          AWS_DEFAULT_REGION: us-east-2
-
-      - task: integration-tests-openjdk11-scala-2-11
-        file: fauna-jvm-repository/concourse/tasks/integration-tests-jdk11-scala-2-11.yml
-        privileged: true
-        params:
-          FAUNA_ROOT_KEY: ((fauna.secret))
-          FAUNA_DOMAIN: ((fauna.domain))
-          FAUNA_SCHEME: ((fauna.scheme))
-          FAUNA_PORT: ((fauna.port))
-
-      - task: integration-tests-openjdk11-scala-2-12
-        file: fauna-jvm-repository/concourse/tasks/integration-tests-jdk11-scala-2-12.yml
-        privileged: true
-        params:
-          FAUNA_ROOT_KEY: ((fauna.secret))
-          FAUNA_DOMAIN: ((fauna.domain))
-          FAUNA_SCHEME: ((fauna.scheme))
-          FAUNA_PORT: ((fauna.port))
+      - in_parallel:
+        - task: integration-tests-oracle-jdk11-scala-2-11
+          file: fauna-jvm-repository/concourse/tasks/integration-tests-oracle-jdk11-scala-2-11.yml
+          privileged: true
+          vars:
+            aws_access_key_id: ((concourse_aws_access_key_id))
+            aws_secret_access_key: ((concourse_aws_access_key_secret))
+          params:
+            FAUNA_ROOT_KEY: ((fauna.secret))
+            FAUNA_DOMAIN: ((fauna.domain))
+            FAUNA_SCHEME: ((fauna.scheme))
+            FAUNA_PORT: ((fauna.port))
+            AWS_ACCESS_KEY_ID: ((concourse_aws_access_key_id))
+            AWS_SECRET_ACCESS_KEY: ((concourse_aws_access_key_secret))
+            AWS_DEFAULT_REGION: us-east-2
+
+        - task: integration-tests-oracle-jdk11-scala-2-12
+          file: fauna-jvm-repository/concourse/tasks/integration-tests-oracle-jdk11-scala-2-12.yml
+          privileged: true
+          vars:
+            aws_access_key_id: ((concourse_aws_access_key_id))
+            aws_secret_access_key: ((concourse_aws_access_key_secret))
+          params:
+            FAUNA_ROOT_KEY: ((fauna.secret))
+            FAUNA_DOMAIN: ((fauna.domain))
+            FAUNA_SCHEME: ((fauna.scheme))
+            FAUNA_PORT: ((fauna.port))
+            AWS_ACCESS_KEY_ID: ((concourse_aws_access_key_id))
+            AWS_SECRET_ACCESS_KEY: ((concourse_aws_access_key_secret))
+            AWS_DEFAULT_REGION: us-east-2
+
+        - task: integration-tests-openjdk11-scala-2-11
+          file: fauna-jvm-repository/concourse/tasks/integration-tests-jdk11-scala-2-11.yml
+          privileged: true
+          params:
+            FAUNA_ROOT_KEY: ((fauna.secret))
+            FAUNA_DOMAIN: ((fauna.domain))
+            FAUNA_SCHEME: ((fauna.scheme))
+            FAUNA_PORT: ((fauna.port))
+
+        - task: integration-tests-openjdk11-scala-2-12
+          file: fauna-jvm-repository/concourse/tasks/integration-tests-jdk11-scala-2-12.yml
+          privileged: true
+          params:
+            FAUNA_ROOT_KEY: ((fauna.secret))
+            FAUNA_DOMAIN: ((fauna.domain))
+            FAUNA_SCHEME: ((fauna.scheme))
+            FAUNA_PORT: ((fauna.port))
 
       - task: publish
         file: fauna-jvm-repository/concourse/tasks/publish.yml

diff --git a/concourse/update-pipeline.sh b/concourse/update-pipeline.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+# update the concourse pipeline with this script.
+
+fly_status=`fly status -t devex`
+if [ "$fly_status" == "logged in successfully" ]
+then
+   echo $fly_status
+else
+    fly login -t devex -n devex -c https://concourse.faunadb.net/
+fi
+
+fly -t devex set-pipeline -p jvm-driver-release-v4 -c concourse/pipeline.yml