Skip to content
Open
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ca33d8b
Fix build
Mar 14, 2024
1abba25
Merge branch 'master' of github.com:findingrish/druid
Jun 10, 2024
4982882
Merge remote-tracking branch 'upstream/master'
Jun 20, 2024
1940170
Merge remote-tracking branch 'upstream/master'
Jul 17, 2024
4c1711e
Merge remote-tracking branch 'upstream/master'
Jul 21, 2024
61f9b4b
Add IT to test BackwardIncompatibility
Jul 21, 2024
a58e7ed
minor change
Jul 21, 2024
c41cdeb
test
Jul 21, 2024
b08cf00
test
Jul 21, 2024
00b8f29
disable some gha checks temporarily
Jul 21, 2024
a351a48
Set env while running revised it
Jul 21, 2024
ccad637
another way to set env
Jul 21, 2024
bfad1e4
log envs in it.sh
Jul 21, 2024
b290f87
test
Jul 21, 2024
666609e
fix minor bug
Jul 21, 2024
a5e4863
pass env vars in resusable-revised-its
Jul 21, 2024
0616c79
enable maven build again
Jul 21, 2024
97486b5
remove env override from pom
Jul 22, 2024
4df3296
temporarily remove conditional
Jul 22, 2024
4d97b55
use correct jdk version in docker tag step
Jul 22, 2024
f977f24
cache the previous image as well
Jul 22, 2024
3a5c798
minor change
Jul 22, 2024
8811712
fix env var usage
Jul 22, 2024
f8aa164
Remove test changes to set env var in it.sh
Jul 22, 2024
b067b30
Debug failure in untarring the previous version
Jul 22, 2024
721532c
Cleanup test changes
Jul 22, 2024
3604451
Derive BACKWARD_INCOMPATIBILITY_IT_ENABLED and DRUID_PREVIOUS_IT_IMAG…
Jul 26, 2024
3ac2385
Rename test group to BackwardCompatibility
Jul 26, 2024
7c34af3
rename config var in gha
Jul 26, 2024
5054ba5
Update job to set env var
Jul 26, 2024
7aaa9fd
temp step to debug env vars are set correctly
Jul 26, 2024
bf93720
minor change
Jul 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update job to set env var
  • Loading branch information
rishabh singh
rishabh singh committed Jul 26, 2024
commit 5054ba5eac51a75c0cd0520864fe50b8bb8fe9ed
72 changes: 40 additions & 32 deletions .github/workflows/unit-and-integration-tests-unified.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,30 @@ env:
#DRUID_PREVIOUS_IT_IMAGE_NAME: org.apache.druid.integration-tests/test:30.0.0

jobs:
set-new-env-var:
name: Set new env var
set-env-var:
name: Set env var
runs-on: ubuntu-latest
outputs:
DRUID_PREVIOUS_IT_IMAGE_NAME: ${{ steps.image_name.outputs.image_name }}
BACKWARD_COMPATIBILITY_IT_ENABLED: ${{ steps.it_enabled.outputs.enabled }}
DRUID_PREVIOUS_VERSION: ${{ env.DRUID_PREVIOUS_VERSION }}
DRUID_PREVIOUS_VERSION_DOWNLOAD_URL: ${{ env.DRUID_PREVIOUS_VERSION_DOWNLOAD_URL }}
steps:
- name: Set new environment variable
- name: Set image name env var
id: image_name
run: |
echo "::set-output name=image_name::org.apache.druid.integration-tests/test:${{ env.DRUID_PREVIOUS_VERSION }}"
- name: Set env for enabling backward compatibility it
id: it_enabled
run: |
if [ -n "${{ env.DRUID_PREVIOUS_VERSION }}" ]; then
echo "export BACKWARD_COMPATIBILITY_IT_ENABLED=true" >> $GITHUB_ENV
echo "::set-output name=enabled::true"
else
echo "export BACKWARD_COMPATIBILITY_IT_ENABLED=false" >> $GITHUB_ENV
echo "::set-output name=enabled::false"
fi
echo "export DRUID_PREVIOUS_IT_IMAGE_NAME=org.apache.druid.integration-tests/test:${{ env.DRUID_PREVIOUS_VERSION }}" >> $GITHUB_ENV
echo "New environment variable: $DRUID_PREVIOUS_IT_IMAGE_NAME, $BACKWARD_COMPATIBILITY_IT_ENABLED"

build:
needs: set-new-env-var
needs: set-env-var
name: "build (jdk${{ matrix.jdk }})"
strategy:
fail-fast: false
Expand Down Expand Up @@ -117,9 +125,9 @@ jobs:
id: docker_container_previous_version
uses: actions/cache@v4
with:
key: druid-container-jdk${{ matrix.jdk }}-version${{ env.DRUID_PREVIOUS_VERSION }}.tar.gz-${{ github.sha }}
key: druid-container-jdk${{ matrix.jdk }}-version${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION }}.tar.gz-${{ github.sha }}
path: |
./druid-container-jdk${{ matrix.jdk }}-version${{ env.DRUID_PREVIOUS_VERSION }}.tar.gz
./druid-container-jdk${{ matrix.jdk }}-version${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION }}.tar.gz

- name: Maven build
id: maven_build
Expand All @@ -128,10 +136,10 @@ jobs:

- name: Container build
env:
BACKWARD_COMPATIBILITY_IT_ENABLED: ${{ env.BACKWARD_COMPATIBILITY_IT_ENABLED }}
DRUID_PREVIOUS_VERSION: ${{ env.DRUID_PREVIOUS_VERSION }}
DRUID_PREVIOUS_VERSION_DOWNLOAD_URL: ${{ env.DRUID_PREVIOUS_VERSION_DOWNLOAD_URL }}
DRUID_PREVIOUS_IT_IMAGE_NAME: ${{ env.DRUID_PREVIOUS_IT_IMAGE_NAME }}
BACKWARD_COMPATIBILITY_IT_ENABLED: ${{ needs.set-env-var.outputs.BACKWARD_COMPATIBILITY_IT_ENABLED }}
DRUID_PREVIOUS_VERSION: ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION }}
DRUID_PREVIOUS_VERSION_DOWNLOAD_URL: ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION_DOWNLOAD_URL }}
DRUID_PREVIOUS_IT_IMAGE_NAME: ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_IT_IMAGE_NAME }}
run: |
./it.sh image
source ./integration-tests-ex/image/target/env.sh
Expand All @@ -144,11 +152,11 @@ jobs:
docker save "$DRUID_IT_IMAGE_NAME" | gzip > druid-container-jdk${{ matrix.jdk }}.tar.gz

- name: Save previous version docker image
if: ${{ env.BACKWARD_COMPATIBILITY_IT_ENABLED == 'true' }}
if: ${{ needs.set-env-var.outputs.BACKWARD_COMPATIBILITY_IT_ENABLED == 'true' }}
run: |
docker tag ${{ env.DRUID_PREVIOUS_IT_IMAGE_NAME }} ${{ env.DRUID_PREVIOUS_IT_IMAGE_NAME }}-jdk${{ matrix.jdk }}-version${{ env.DRUID_PREVIOUS_VERSION }}
echo ${{ env.DRUID_PREVIOUS_IT_IMAGE_NAME }}
docker save "${{ env.DRUID_PREVIOUS_IT_IMAGE_NAME }}" | gzip > druid-container-jdk${{ matrix.jdk }}-version${{ env.DRUID_PREVIOUS_VERSION }}.tar.gz
docker tag ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_IT_IMAGE_NAME }} ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_IT_IMAGE_NAME }}-jdk${{ matrix.jdk }}-version${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION }}
echo ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_IT_IMAGE_NAME }}
docker save "${{ needs.set-env-var.outputs.DRUID_PREVIOUS_IT_IMAGE_NAME }}" | gzip > druid-container-jdk${{ matrix.jdk }}-version${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION }}.tar.gz

unit-tests-phase2:
strategy:
Expand Down Expand Up @@ -180,22 +188,22 @@ jobs:
if: ${{ always() && (needs.unit-tests.result == 'success' || needs.unit-tests.outputs.continue_tests) }}
uses: ./.github/workflows/standard-its.yml

expose-vars:
runs-on: ubuntu-latest
outputs:
DRUID_PREVIOUS_VERSION: ${{ env.DRUID_PREVIOUS_VERSION }}
DRUID_PREVIOUS_VERSION_DOWNLOAD_URL: ${{ env.DRUID_PREVIOUS_VERSION_DOWNLOAD_URL }}
BACKWARD_COMPATIBILITY_IT_ENABLED: ${{ BACKWARD_COMPATIBILITY_IT_ENABLED }}
DRUID_PREVIOUS_IT_IMAGE_NAME: ${{ DRUID_PREVIOUS_IT_IMAGE_NAME }}
steps:
- run: echo "Exposing env vars"
# expose-vars:
# runs-on: ubuntu-latest
# outputs:
# DRUID_PREVIOUS_VERSION: ${{ env.DRUID_PREVIOUS_VERSION }}
# DRUID_PREVIOUS_VERSION_DOWNLOAD_URL: ${{ env.DRUID_PREVIOUS_VERSION_DOWNLOAD_URL }}
# BACKWARD_COMPATIBILITY_IT_ENABLED: $BACKWARD_COMPATIBILITY_IT_ENABLED
# DRUID_PREVIOUS_IT_IMAGE_NAME: $DRUID_PREVIOUS_IT_IMAGE_NAME
# steps:
# - run: echo "Exposing env vars"

revised-its:
needs: [unit-tests, expose-vars]
needs: [unit-tests, set-env-var]
if: ${{ always() && (needs.unit-tests.result == 'success' || needs.unit-tests.outputs.continue_tests) }}
uses: ./.github/workflows/revised-its.yml
with:
BACKWARD_COMPATIBILITY_IT_ENABLED: ${{ needs.expose-vars.outputs.BACKWARD_COMPATIBILITY_IT_ENABLED }}
DRUID_PREVIOUS_VERSION: ${{ needs.expose-vars.outputs.DRUID_PREVIOUS_VERSION }}
DRUID_PREVIOUS_VERSION_DOWNLOAD_URL: ${{ needs.expose-vars.outputs.DRUID_PREVIOUS_VERSION_DOWNLOAD_URL }}
DRUID_PREVIOUS_IT_IMAGE_NAME: ${{ needs.expose-vars.outputs.DRUID_PREVIOUS_IT_IMAGE_NAME }}
BACKWARD_COMPATIBILITY_IT_ENABLED: ${{ needs.set-env-var.outputs.BACKWARD_COMPATIBILITY_IT_ENABLED }}
DRUID_PREVIOUS_VERSION: ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION }}
DRUID_PREVIOUS_VERSION_DOWNLOAD_URL: ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION_DOWNLOAD_URL }}
DRUID_PREVIOUS_IT_IMAGE_NAME: ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_IT_IMAGE_NAME }}