[CI] Make Serverless project name unique

Author: picandocodigo

.buildkite/create-serverless.sh

@@ -8,8 +8,7 @@ if [[ -z $EC_PROJECT_PREFIX ]]; then
 fi
 
 # Using BUILDKITE_JOB_ID for the name to make it unique:
-# export EC_PROJECT_NAME="$EC_PROJECT_PREFIX-$BUILDKITE_JOB_ID"
-export EC_PROJECT_NAME="$EC_PROJECT_PREFIX-test"
+export EC_PROJECT_NAME="$EC_PROJECT_PREFIX-$BUILDKITE_JOB_ID"
 echo -e "--- :elasticsearch: Start serverless instance $EC_PROJECT_NAME"
 
 qaf elastic-cloud projects create --project-type elasticsearch
@@ -20,6 +19,7 @@ export ES_API_SECRET_KEY=$(echo "$deployment" | jq -r '.credentials.api_key')
 export ELASTICSEARCH_URL=$(echo "$deployment" | jq -r '.elasticsearch.url')
 buildkite-agent meta-data set "ES_API_SECRET_KEY" $ES_API_SECRET_KEY
 buildkite-agent meta-data set "ELASTICSEARCH_URL" $ELASTICSEARCH_URL
+buildkite-agent meta-data set "EC_PROJECT_NAME" $EC_PROJECT_NAME
 
 echo -e "--- :computer: Environment variables"
 echo -e "ELASTICSEARCH_URL $ELASTICSEARCH_URL"

.buildkite/pipeline.yml

@@ -77,10 +77,10 @@ steps:
       EC_REGISTER_BACKEND: buildkite
       EC_ENV: qa
       EC_REGION: aws-eu-west-1
-      EC_PROJECT_NAME: ruby-test
     commands:
       - mkdir ~/.elastic
       - touch ~/.elastic/cloud.json
+      - export EC_PROJECT_NAME=`buildkite-agent meta-data get "EC_PROJECT_NAME"`
       - echo "{\"api_key\":{\"qa\":\"$(vault read -field=qa secret/ci/elastic-elasticsearch-ruby/cloud-access)\"}}" > ~/.elastic/cloud.json
       - qaf elastic-cloud projects delete
   - wait: ~