From 3757c1246551354084699fdad4f1080685a840cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez=20Ruiz?= Date: Mon, 20 Dec 2021 13:31:10 +0100 Subject: [PATCH 1/4] Changes applyed to `2UCGBV3J` --- .github/workflows/main.yml | 7 ++++++- .github/workflows/master.yml | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b0301e5..284f9eb9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,11 +23,13 @@ jobs: submodules: true token: ${{ secrets.CARTOFANTE_PERSONAL_TOKEN }} + - uses: google-github-actions/auth@v0 + with: + credentials_json: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }} - name: Setup gcloud authentication uses: google-github-actions/setup-gcloud@master with: version: ${{env.GCLOUD_VERSION}} - service_account_key: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }} - name: Configure docker and pull images run: | @@ -93,6 +95,9 @@ jobs: path: 'docker-dev-env' token: ${{ secrets.CARTOFANTE_PERSONAL_TOKEN }} + - uses: google-github-actions/auth@v0 + with: + credentials_json: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }} - name: Set up gcloud I uses: google-github-actions/setup-gcloud@master with: diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 7fc3c3f9..3a599cf0 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -30,11 +30,13 @@ jobs: docker build -f private/Dockerfile --label="org.opencontainers.image.created=$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${GITHUB_SHA} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:latest -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_SHA::7} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/}--${GITHUB_SHA::7} . docker build -f private/Dockerfile.onprem --label="org.opencontainers.image.created=$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${GITHUB_SHA} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:latest -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:${GITHUB_SHA::7} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:${GITHUB_REF##*/}--${GITHUB_SHA::7} . + - uses: google-github-actions/auth@v0 + with: + credentials_json: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }} - name: Setup gcloud authentication uses: google-github-actions/setup-gcloud@master with: version: ${{env.GCLOUD_VERSION}} - service_account_key: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }} - name: Configure docker run: gcloud auth configure-docker From 8746dd5d190643d44f16473ce9302656e6fd080d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez=20Ruiz?= Date: Mon, 20 Dec 2021 13:31:34 +0100 Subject: [PATCH 2/4] Changes applyed to `EPEL7Q9I` --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 284f9eb9..55668eb3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -101,7 +101,6 @@ jobs: - name: Set up gcloud I uses: google-github-actions/setup-gcloud@master with: - service_account_key: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }} export_default_credentials: true version: '297.0.1' # https://github.com/google-github-actions/setup-gcloud/issues/128 From 17bdf76364bacaec68283c9c26b4fa08c772e09f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez=20Ruiz?= Date: Mon, 20 Dec 2021 16:47:21 +0100 Subject: [PATCH 3/4] HotFix --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 55668eb3..2e2b1065 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -101,7 +101,6 @@ jobs: - name: Set up gcloud I uses: google-github-actions/setup-gcloud@master with: - export_default_credentials: true version: '297.0.1' # https://github.com/google-github-actions/setup-gcloud/issues/128 - name: Set up gcloud II From 4bdc68d6b5149015f57b02b36142e12001cdcf0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez=20Ruiz?= Date: Tue, 21 Dec 2021 08:55:43 +0100 Subject: [PATCH 4/4] HotFix --- .github/workflows/main.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e2b1065..2f793dbd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,8 +104,11 @@ jobs: version: '297.0.1' # https://github.com/google-github-actions/setup-gcloud/issues/128 - name: Set up gcloud II + env: + SA_TO_USE: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }} run: | - gcloud auth configure-docker + # gcloud auth configure-docker + echo "${SA_TO_USE}" | base64 -d | docker login -u _json_key --password-stdin https://gcr.io # Dev tests - name: Download containers in background @@ -140,6 +143,7 @@ jobs: - name: Run dev tests working-directory: ./docker-dev-env run: | + set -e source .env docker run --rm --name tavern-tester \ --env "CARTO_USER=${USER_USERNAME}" \ @@ -189,17 +193,23 @@ jobs: - name: Init onprem working-directory: ./dockerize-onpremises + env: + COMPOSE_FILE: docker-compose.yml:ci/docker-compose.ci.yml run: | ./ci/init.sh - name: Install license working-directory: ./dockerize-onpremises + env: + COMPOSE_FILE: docker-compose.yml:ci/docker-compose.ci.yml run: | mkdir -p license && cp -f ci/test_license/dockerize-onpremises-tests-license.lic license/carto.lic ./script/license.sh - name: Run onprem tests working-directory: ./dockerize-onpremises + env: + COMPOSE_FILE: docker-compose.yml:ci/docker-compose.ci.yml run: | source .env source ci/.env.ci @@ -216,6 +226,8 @@ jobs: - name: Export onprem compose logs working-directory: ./dockerize-onpremises + env: + COMPOSE_FILE: docker-compose.yml:ci/docker-compose.ci.yml run: | docker-compose -f docker-compose.yml -f ci/docker-compose.ci.yml logs --no-color > onprem_docker_compose_logs echo "Logs will be available during 14 days at gs://${GCS_BUCKET_NAME}/test_logs_${GITHUB_RUN_ID}/"