From 0d86874d5dbb83c825ecc7c7d99240dad506cc50 Mon Sep 17 00:00:00 2001 From: Rodrigo Toshiaki Horie Date: Thu, 27 Nov 2025 10:43:38 -0300 Subject: [PATCH] Organize S3 schema uploads by product (awx/tower) (#16190) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update schema upload workflows to organize S3 files by product name: - Upload schemas to s3://awx-public-ci-files/{product}/{branch}/schema.json - Update Makefile to download from product-specific paths for schema diff - Update feature branch deletion to clean up from correct product path This separates AWX and Tower schemas into distinct S3 folders. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude --- .github/workflows/feature_branch_deletion.yml | 2 +- .github/workflows/upload_schema.yml | 2 +- Makefile | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/feature_branch_deletion.yml b/.github/workflows/feature_branch_deletion.yml index 4893f8267d..0de807aaf4 100644 --- a/.github/workflows/feature_branch_deletion.yml +++ b/.github/workflows/feature_branch_deletion.yml @@ -20,4 +20,4 @@ jobs: run: | ansible localhost -c local, -m command -a "{{ ansible_python_interpreter + ' -m pip install boto3'}}" ansible localhost -c local -m aws_s3 \ - -a "bucket=awx-public-ci-files object=${GITHUB_REF##*/}/schema.json mode=delobj permission=public-read" + -a "bucket=awx-public-ci-files object=${{ github.event.repository.name }}/${GITHUB_REF##*/}/schema.json mode=delobj permission=public-read" diff --git a/.github/workflows/upload_schema.yml b/.github/workflows/upload_schema.yml index 0537e71895..f9c2118523 100644 --- a/.github/workflows/upload_schema.yml +++ b/.github/workflows/upload_schema.yml @@ -42,7 +42,7 @@ jobs: with: command: cp source: ${{ github.workspace }}/schema.json - destination: s3://awx-public-ci-files/${{ github.ref_name }}/schema.json + destination: s3://awx-public-ci-files/${{ github.event.repository.name }}/${{ github.ref_name }}/schema.json aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY }} aws_secret_access_key: ${{ secrets.AWS_SECRET_KEY }} aws_region: us-east-1 diff --git a/Makefile b/Makefile index 2e5727590c..7b8eb41065 100644 --- a/Makefile +++ b/Makefile @@ -539,9 +539,10 @@ docker-compose-runtest: awx/projects docker-compose-sources docker-compose-build-schema: awx/projects docker-compose-sources $(DOCKER_COMPOSE) -f tools/docker-compose/_sources/docker-compose.yml run --rm --service-ports --no-deps awx_1 make genschema +SCHEMA_DIFF_BASE_FOLDER ?= awx SCHEMA_DIFF_BASE_BRANCH ?= devel detect-schema-change: genschema - curl https://s3.amazonaws.com/awx-public-ci-files/$(SCHEMA_DIFF_BASE_BRANCH)/schema.json -o reference-schema.json + curl https://s3.amazonaws.com/awx-public-ci-files/$(SCHEMA_DIFF_BASE_FOLDER)/$(SCHEMA_DIFF_BASE_BRANCH)/schema.json -o reference-schema.json # Ignore differences in whitespace with -b # diff exits with 1 when files differ - capture but don't fail -diff -u -b reference-schema.json schema.json