Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply USE_TESTENV_PROPERTIES only on container tests with aqa-tests #5406

Merged
merged 1 commit into from
Jun 28, 2024

Conversation

LongyuZhang
Copy link
Contributor

@LongyuZhang LongyuZhang commented Jun 25, 2024

  • Since container tests without github_url of aqa-tests don't need to inherit testenv
  • Modify USE_TESTENV_PROPERTIE to only apply with container tests with aqa-tests
    Related Issue: Non-container external tests broken #5403

@LongyuZhang LongyuZhang marked this pull request as draft June 25, 2024 21:46
@LongyuZhang LongyuZhang force-pushed the envf1 branch 2 times, most recently from 6d50bcb to 8105da3 Compare June 27, 2024 02:50
@LongyuZhang LongyuZhang changed the title Fix container ENV USE_TESTENV_PROPERTIES Apply USE_TESTENV_PROPERTIE only on container tests with aqa-tests Jun 27, 2024
@LongyuZhang LongyuZhang force-pushed the envf1 branch 5 times, most recently from 9736a1e to 5e53f50 Compare June 27, 2024 16:46
@smlambert smlambert changed the title Apply USE_TESTENV_PROPERTIE only on container tests with aqa-tests Apply USE_TESTENV_PROPERTIES only on container tests with aqa-tests Jun 27, 2024
- Since container tests without github_url of aqa-tests don't need to inherit testenv
- Modify USE_TESTENV_PROPERTIE to only apply with container tests with aqa-tests

Signed-off-by: LongyuZhang <[email protected]>
@LongyuZhang
Copy link
Contributor Author

LongyuZhang commented Jun 27, 2024

Test Links:

11:28:29       [exec] #9 [ 5/11] RUN git clone https://github.com/quarkusio/quarkus-quickstarts.git
11:28:30       [exec] #9 0.679 Cloning into 'quarkus-quickstarts'...
11:28:32       [exec] #9 DONE 3.2s
11:28:33       [exec] 
11:28:33       [exec] #10 [ 6/11] WORKDIR /quarkus-quickstarts/
11:28:33       [exec] #10 DONE 0.1s
11:28:33       [exec] 
11:28:33       [exec] #11 [ 7/11] RUN git checkout 2.7.2.Final
12:10:17       [exec] #7 [3/9] RUN git clone https://github.com/apache/lucene-solr.git
12:10:18       [exec] #7 0.481 Cloning into 'lucene-solr'...
12:11:13       [exec] #7 DONE 48.6s
12:11:13       [exec] 
12:11:13       [exec] #8 [4/9] WORKDIR /lucene-solr/
12:11:13       [exec] #8 DONE 0.1s
12:11:13       [exec] 
12:11:13       [exec] #9 [5/9] RUN git checkout releases/lucene-solr/8.11.1
  • criu-portable-checkpoint_test without USE_TESTENV_PROPERTIES: checkpoint: hyc_grinder 41644, restore: hyc_grinder 41650 (use default repo and branch)
- it is using default aqa-tests repo and branch
12:55:07       [exec] STEP 18/26: RUN git clone https://github.com/adoptium/aqa-tests.git
12:55:07       [exec] Cloning into 'aqa-tests'...
12:55:18       [exec] Updating files:  94% (1622/1721)
12:55:24       [exec] --> 17c2da5787d
12:55:24       [exec] STEP 19/26: WORKDIR /aqa-tests/
12:55:24       [exec] --> 72bc1af0623
12:55:24       [exec] STEP 20/26: RUN git checkout master
  • criu-portable-checkpoint_test with USE_TESTENV_PROPERTIES: checkpoint: hyc_grinder 41645; restore: hyc_grinder 41653 (inherit jenkins repo and branch)
- it is inheriting aqa-tests and TKG repo and branch
12:55:20       [exec] STEP 19/27: RUN git clone https://github.com/longyuzhang/aqa-tests.git
12:55:21       [exec] Cloning into 'aqa-tests'...
12:55:26       [exec] Updating files:  94% (1622/1721)
12:55:33       [exec] --> 2aff5981831
12:55:34       [exec] STEP 20/27: WORKDIR /aqa-tests/
12:55:34       [exec] --> bf33bc87cf3
12:55:34       [exec] STEP 21/27: RUN git checkout envf1

and

12:55:48  git clone -q https://github.com/adoptium/TKG.git
12:55:49  git rev-parse v1.0.2

@LongyuZhang LongyuZhang marked this pull request as ready for review June 27, 2024 19:35
@smlambert smlambert merged commit fc2504b into adoptium:master Jun 28, 2024
2 checks passed
LongyuZhang added a commit to LongyuZhang/aqa-tests that referenced this pull request Jun 28, 2024
…doptium#5406)

- Since container tests without github_url of aqa-tests don't need to inherit testenv
- Modify USE_TESTENV_PROPERTIES to only apply with container tests with aqa-tests

Signed-off-by: LongyuZhang <[email protected]>
sophia-guo pushed a commit that referenced this pull request Jun 28, 2024
…5406) (#5411)

- Since container tests without github_url of aqa-tests don't need to inherit testenv
- Modify USE_TESTENV_PROPERTIES to only apply with container tests with aqa-tests

Signed-off-by: LongyuZhang <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants