From 74ea1dce733cba5c8c408d046c4ec774b787a25b Mon Sep 17 00:00:00 2001 From: Cleve Stuart Date: Thu, 26 Oct 2023 12:30:32 -0700 Subject: [PATCH 1/2] Improve pipeline --- .gitignore | 1 + concourse/pipeline.yml | 104 +++++++++++++++++++---------------- concourse/update-pipeline.sh | 12 ++++ 3 files changed, 70 insertions(+), 47 deletions(-) create mode 100755 concourse/update-pipeline.sh diff --git a/.gitignore b/.gitignore index f836598d..4ec6180c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ target/ target-android/ .bsp *.iml +*~ \ No newline at end of file diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index 5aca075e..5798683a 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -27,60 +27,70 @@ resources: private_key: ((github_repo_key)) jobs: + - name: set-self + serial: true + plan: + - get: fauna-jvm-repository + - get: fauna-jvm-repository-docs + - 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 new file mode 100755 index 00000000..56bc8653 --- /dev/null +++ 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 From e6dff2464fa9a8b807a30540a066cb801ffaccae Mon Sep 17 00:00:00 2001 From: Cleve Stuart Date: Thu, 26 Oct 2023 12:32:23 -0700 Subject: [PATCH 2/2] Fixup --- concourse/pipeline.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index 5798683a..0c46b57b 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -31,7 +31,9 @@ jobs: 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