Skip to content

Commit b91338c

Browse files
committed
Deleted the following entire modules: alpini-common-cli, alpini-common-const,
alpini-common-io, alpini-common-log, alpini-common-native, alpini-common-test. Also removed the Alpini Functional Tests CI task, since there is no such test left, and made the Alpini Unit Tests run on every commit, rather than only when these files are modified, since they run pretty quickly now.
1 parent eb6aa9e commit b91338c

File tree

60 files changed

+8
-13827
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+8
-13827
lines changed

.github/workflows/VeniceCI-CompatibilityTests.yml

Lines changed: 2 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -55,27 +55,16 @@ jobs:
5555
jdk: [8, 11, 17]
5656
runs-on: ubuntu-latest
5757
timeout-minutes: 120
58-
outputs:
59-
alpini_touched: ${{ steps.check_alpini_files_changed.outputs.alpini }}
6058
steps:
6159
- uses: actions/checkout@v4
6260
with:
6361
# Checkout as many commits as needed for the diff
6462
fetch-depth: 2
65-
- name: Check if files have changed
66-
uses: dorny/paths-filter@v3
67-
id: check_alpini_files_changed
68-
with:
69-
filters: |
70-
alpini:
71-
- 'internal/alpini/**'
7263
- uses: actions/checkout@v4
73-
if: steps.check_alpini_files_changed.outputs.alpini == 'true'
7464
with:
7565
fetch-depth: 0
7666
- name: Set up JDK
7767
uses: actions/setup-java@v4
78-
if: steps.check_alpini_files_changed.outputs.alpini == 'true'
7968
with:
8069
java-version: ${{ matrix.jdk }}
8170
distribution: 'temurin'
@@ -92,104 +81,30 @@ jobs:
9281
# echo "java.security file after modifications: "
9382
# cat "$JAVA_HOME/conf/security/java.security"
9483
- shell: bash
95-
if: steps.check_alpini_files_changed.outputs.alpini == 'true'
9684
run: |
9785
git remote set-head origin --auto
9886
git remote add upstream https://github.com/linkedin/venice
9987
git fetch upstream
10088
- name: Setup Gradle
101-
if: steps.check_alpini_files_changed.outputs.alpini == 'true'
10289
uses: gradle/actions/setup-gradle@v4
10390
- name: Run alpini unit tests
104-
if: steps.check_alpini_files_changed.outputs.alpini == 'true'
10591
run: ./gradlew --continue --no-daemon -DmaxParallelForks=1 alpiniUnitTest
10692
- name: Package Build Artifacts
107-
if: steps.check_alpini_files_changed.outputs.alpini == 'true' && (success() || failure())
93+
if: (success() || failure())
10894
shell: bash
10995
run: |
11096
mkdir ${{ github.job }}-artifacts
11197
find . -path "**/build/reports/*" -or -path "**/build/test-results/*" > artifacts.list
11298
rsync -R --files-from=artifacts.list . ${{ github.job }}-artifacts
11399
tar -zcvf ${{ github.job }}-jdk${{ matrix.jdk }}-logs.tar.gz ${{ github.job }}-artifacts
114100
- name: Upload Build Artifacts
115-
if: steps.check_alpini_files_changed.outputs.alpini == 'true' && (success() || failure())
101+
if: (success() || failure())
116102
uses: actions/upload-artifact@v4
117103
with:
118104
name: ${{ github.job }}-jdk${{ matrix.jdk }}
119105
path: ${{ github.job }}-jdk${{ matrix.jdk }}-logs.tar.gz
120106
retention-days: 30
121107

122-
AlpiniFunctionalTests:
123-
strategy:
124-
fail-fast: false
125-
matrix:
126-
jdk: [17]
127-
runs-on: ubuntu-latest
128-
timeout-minutes: 120
129-
outputs:
130-
alpini_touched: ${{ steps.check_alpini_files_changed.outputs.alpini }}
131-
steps:
132-
- uses: actions/checkout@v4
133-
with:
134-
# Checkout as many commits as needed for the diff
135-
fetch-depth: 2
136-
- name: Check if files have changed
137-
uses: dorny/paths-filter@v3
138-
id: check_alpini_files_changed
139-
with:
140-
filters: |
141-
alpini:
142-
- 'internal/alpini/**'
143-
- uses: actions/checkout@v4
144-
if: steps.check_alpini_files_changed.outputs.alpini == 'true'
145-
with:
146-
fetch-depth: 0
147-
- name: Set up JDK
148-
uses: actions/setup-java@v4
149-
if: steps.check_alpini_files_changed.outputs.alpini == 'true'
150-
with:
151-
java-version: ${{ matrix.jdk }}
152-
distribution: 'temurin'
153-
cache: 'gradle'
154-
# - name: Allow Deprecated TLS versions for Alpini tests
155-
# run: |
156-
# echo "java.security file before modifications: "
157-
# cat "$JAVA_HOME/conf/security/java.security"
158-
159-
# # This is possibly flaky but
160-
# sed -i 's/TLSv1, //g' "$JAVA_HOME/conf/security/java.security" # Allow TLSv1
161-
# sed -i 's/TLSv1.1, //g' "$JAVA_HOME/conf/security/java.security" # Allow TLSv1.1
162-
163-
# echo "java.security file after modifications: "
164-
# cat "$JAVA_HOME/conf/security/java.security"
165-
- shell: bash
166-
if: steps.check_alpini_files_changed.outputs.alpini == 'true'
167-
run: |
168-
git remote set-head origin --auto
169-
git remote add upstream https://github.com/linkedin/venice
170-
git fetch upstream
171-
- name: Setup Gradle
172-
if: steps.check_alpini_files_changed.outputs.alpini == 'true'
173-
uses: gradle/actions/setup-gradle@v4
174-
- name: Run alpini functional tests
175-
if: steps.check_alpini_files_changed.outputs.alpini == 'true'
176-
run: ./gradlew --continue --no-daemon -DmaxParallelForks=1 alpiniFunctionalTest
177-
- name: Package Build Artifacts
178-
if: steps.check_alpini_files_changed.outputs.alpini == 'true' && (success() || failure())
179-
shell: bash
180-
run: |
181-
mkdir ${{ github.job }}-artifacts
182-
find . -path "**/build/reports/*" -or -path "**/build/test-results/*" > artifacts.list
183-
rsync -R --files-from=artifacts.list . ${{ github.job }}-artifacts
184-
tar -zcvf ${{ github.job }}-jdk${{ matrix.jdk }}-logs.tar.gz ${{ github.job }}-artifacts
185-
- name: Upload Build Artifacts
186-
if: steps.check_alpini_files_changed.outputs.alpini == 'true' && (success() || failure())
187-
uses: actions/upload-artifact@v4
188-
with:
189-
name: ${{ github.job }}
190-
path: ${{ github.job }}-jdk${{ matrix.jdk }}-logs.tar.gz
191-
retention-days: 30
192-
193108
PulsarVeniceIntegrationTests:
194109
strategy:
195110
fail-fast: false

build.gradle

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@ subprojects {
387387
def ALPINI_TEST_FILTER = 'com.linkedin.alpini.*'
388388
def ALPINI_NETTY_TEST_FILTER = 'io.netty.*'
389389
def ALPINI_UNIT_TEST_TASK_NAME = 'alpiniUnitTest'
390-
def ALPINI_FUNCTIONAL_TEST_TASK_NAME = 'alpiniFunctionalTest'
391390

392391
tasks.withType(Test) {
393392
mustRunAfter tasks.withType(SpotBugsTask)
@@ -419,7 +418,7 @@ subprojects {
419418
println "jvmArgs=$allJvmArgs"
420419
}
421420

422-
if (name != ALPINI_UNIT_TEST_TASK_NAME && name != ALPINI_FUNCTIONAL_TEST_TASK_NAME) {
421+
if (name != ALPINI_UNIT_TEST_TASK_NAME) {
423422
filter {
424423
excludeTestsMatching ALPINI_TEST_FILTER
425424
excludeTestsMatching ALPINI_NETTY_TEST_FILTER
@@ -564,17 +563,6 @@ subprojects {
564563
}
565564
}
566565

567-
task "$ALPINI_FUNCTIONAL_TEST_TASK_NAME"(type: Test) {
568-
useTestNG() {
569-
includeGroups 'functional'
570-
}
571-
filter {
572-
includeTestsMatching ALPINI_TEST_FILTER
573-
includeTestsMatching ALPINI_NETTY_TEST_FILTER
574-
failOnNoMatchingTests = false
575-
}
576-
}
577-
578566
tasks.withType(Jar) {
579567
zip64 = true
580568
duplicatesStrategy = DuplicatesStrategy.FAIL

internal/alpini/common/alpini-common-base/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ configurations {
44

55
dependencies {
66
testImplementation libraries.testng
7-
implementation project(':internal:alpini:common:alpini-common-const')
87
implementation libraries.jacksonDatabind
98
implementation libraries.jsr305
109
implementation libraries.log4j2api

internal/alpini/common/alpini-common-cli/build.gradle

Lines changed: 0 additions & 11 deletions
This file was deleted.

internal/alpini/common/alpini-common-cli/src/main/java/com/linkedin/alpini/cli/CLIArgument.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)