diff --git a/.kokoro/release.cfg b/.kokoro/release.cfg index f2ee4665..08d0ac9f 100644 --- a/.kokoro/release.cfg +++ b/.kokoro/release.cfg @@ -6,6 +6,14 @@ before_action { keystore_config_id: 75669 keyname: "functions-framework-java-release-bot-sonatype-password" } + keystore_resource { + keystore_config_id: 75669 + keyname: "functions-framework-release-sonatype-central-portal-username" + } + keystore_resource { + keystore_config_id: 75669 + keyname: "functions-framework-release-sonatype-central-portal-password" + } keystore_resource { keystore_config_id: 70247 keyname: "maven-gpg-pubkeyring" diff --git a/.kokoro/release.sh b/.kokoro/release.sh index 7a7e067e..1aa8d455 100644 --- a/.kokoro/release.sh +++ b/.kokoro/release.sh @@ -24,29 +24,6 @@ setup_environment_secrets() { mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GNUPGHOME/pubring.gpg mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GNUPGHOME/secring.gpg gpg -k - - echo "KOKORO_GFILE_DIR: ${KOKORO_GFILE_DIR}" - SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager" - echo "Creating folder for secrets: ${SECRET_LOCATION} (if not exists)" - mkdir -p "${SECRET_LOCATION}" - echo "Content of ${SECRET_LOCATION}:" - ls -alt "${SECRET_LOCATION}" - echo "------" - - export SECRET_MANAGER_PROJECT_ID="serverless-runtimes" - export CENTRAL_REPO_USER="sonatype-central-repo-user" - export CENTRAL_REPO_TOKEN="sonatype-central-repo-token" - SECRET_MANAGER_KEYS="${CENTRAL_REPO_USER} ${CENTRAL_REPO_TOKEN}" - echo "SECRET_MANAGER_PROJECT_ID: ${SECRET_MANAGER_PROJECT_ID}, SECRET_MANAGER_KEYS: ${SECRET_MANAGER_KEYS}" - - for key in $(echo "${SECRET_MANAGER_KEYS}" | sed "s/,/ /g") - do - gcloud secrets versions access latest \ - --project "${SECRET_MANAGER_PROJECT_ID}" \ - --secret "${key}" \ - --out-file "${SECRET_LOCATION}/${key}" - echo "Created ${SECRET_LOCATION}/${key}" - done } create_settings_xml_file() { @@ -64,8 +41,8 @@ create_settings_xml_file() { sonatype-central-portal - $(cat "${SECRET_LOCATION}/${CENTRAL_REPO_USER}") - $(cat "${SECRET_LOCATION}/${CENTRAL_REPO_TOKEN}") + $(cat "${KOKORO_KEYSTORE_DIR}/75699_functions-framework-release-sonatype-central-portal-username") + $(cat "${KOKORO_KEYSTORE_DIR}/75699_functions-framework-release-sonatype-central-portal-password")