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.

Sign up for GitHub

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

09508 fix util scale pricing check #3

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

09508 fix util scale pricing check #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bfccd81
test: add isolation flag to UtilScalePricingCheck
vtronkov Dec 5, 2023
1f53fec
Merge branch 'develop' into 09508_Fix_UtilScalePricingCheck
agadzhalov Dec 14, 2023
8887abe
xx
isavov Dec 18, 2023
394a215
x
isavov Dec 18, 2023
da2877d
xx
isavov Dec 18, 2023
ad7c9f1
xx
isavov Dec 18, 2023
b075563
xx
isavov Dec 18, 2023
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
39 changes: 21 additions & 18 deletions .github/workflows/node-zxc-compile-application-code.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,14 @@ permissions:
env:
GRADLE_CACHE_USERNAME: ${{ secrets.gradle-cache-username }}
GRADLE_CACHE_PASSWORD: ${{ secrets.gradle-cache-password }}
GRADLE_EXEC: cgexec -g cpu,memory:gradle-${{ github.run_id }} --sticky ionice -c 2 -n 2 nice -n 19 ./gradlew
GRADLE_EXEC: ./gradlew
CG_EXEC: cgexec -g cpu,memory:gradle-${{ github.run_id }} --sticky ionice -c 2 -n 2 nice -n 19

jobs:
compile:
name: ${{ inputs.custom-job-label || 'Compiles' }}
runs-on: [self-hosted, Linux, large, ephemeral]
# runs-on: [self-hosted, Linux, large, ephemeral]
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -168,6 +169,8 @@ jobs:

- name: Setup Control Groups
run: |
set -v
set +e
echo "::group::Get System Configuration"
USR_ID="$(id -un)"
GRP_ID="$(id -gn)"
Expand Down Expand Up @@ -224,9 +227,9 @@ jobs:
uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
if: ${{ inputs.enable-unit-tests && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
check_name: 'Node: Unit Test Results'
check_name: "Node: Unit Test Results"
check_run_disabled: false
json_thousands_separator: ','
json_thousands_separator: ","
junit_files: "**/build/test-results/test/TEST-*.xml"

- name: Setup Docker BuildX
Expand All @@ -248,9 +251,9 @@ jobs:
uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
if: ${{ inputs.enable-integration-tests && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
check_name: 'Node: Integration Test Results'
check_name: "Node: Integration Test Results"
check_run_disabled: false
json_thousands_separator: ','
json_thousands_separator: ","
junit_files: "**/build/test-results/itest/TEST-*.xml"

- name: Publish Integration Test Network Logs
Expand All @@ -273,9 +276,9 @@ jobs:
uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
if: ${{ inputs.enable-hapi-tests-misc && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
check_name: 'Node: HAPI Test (Misc) Results'
check_name: "Node: HAPI Test (Misc) Results"
check_run_disabled: false
json_thousands_separator: ','
json_thousands_separator: ","
junit_files: "**/build/test-results/hapiTestMisc/TEST-*.xml"

- name: Publish HAPI Test (Misc) Network Logs
Expand All @@ -298,9 +301,9 @@ jobs:
uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
if: ${{ inputs.enable-hapi-tests-crypto && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
check_name: 'Node: HAPI Test (Crypto) Results'
check_name: "Node: HAPI Test (Crypto) Results"
check_run_disabled: false
json_thousands_separator: ','
json_thousands_separator: ","
junit_files: "**/build/test-results/hapiTestCrypto/TEST-*.xml"

- name: Publish HAPI Test (crypto) Network Logs
Expand All @@ -323,9 +326,9 @@ jobs:
uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
if: ${{ inputs.enable-hapi-tests-token && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
check_name: 'Node: HAPI Test (Token) Results'
check_name: "Node: HAPI Test (Token) Results"
check_run_disabled: false
json_thousands_separator: ','
json_thousands_separator: ","
junit_files: "**/build/test-results/hapiTestToken/TEST-*.xml"

- name: Publish HAPI Test (Token) Network Logs
Expand All @@ -348,9 +351,9 @@ jobs:
uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
if: ${{ inputs.enable-hapi-tests-smart-contract && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
check_name: 'Node: HAPI Test (Smart Contract) Results'
check_name: "Node: HAPI Test (Smart Contract) Results"
check_run_disabled: false
json_thousands_separator: ','
json_thousands_separator: ","
junit_files: "**/build/test-results/hapiTestSmartContract/TEST-*.xml"

- name: Publish HAPI Test (Smart Contract) Network Logs
Expand All @@ -373,9 +376,9 @@ jobs:
uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
if: ${{ inputs.enable-hapi-tests-time-consuming && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
check_name: 'Node: HAPI Test (Time Consuming) Results'
check_name: "Node: HAPI Test (Time Consuming) Results"
check_run_disabled: false
json_thousands_separator: ','
json_thousands_separator: ","
junit_files: "**/build/test-results/hapiTestTimeConsuming/TEST-*.xml"

- name: Publish HAPI Test (Time Consuming) Network Logs
Expand All @@ -395,9 +398,9 @@ jobs:
uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
if: ${{ inputs.enable-e2e-tests && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
check_name: 'Node: E2E Test Results'
check_name: "Node: E2E Test Results"
check_run_disabled: false
json_thousands_separator: ','
json_thousands_separator: ","
junit_files: "**/build/test-results/eet/TEST-*.xml"

- name: Publish E2E Test Network Logs
Expand Down
6 changes: 4 additions & 2 deletions ...lients/src/main/java/com/hedera/services/bdd/suites/regression/UtilScalePricingCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import static com.hedera.services.bdd.spec.utilops.UtilVerbs.overridingTwo;

import com.google.protobuf.ByteString;
import com.hedera.services.bdd.junit.HapiTest;
import com.hedera.services.bdd.junit.HapiTestSuite;
import com.hedera.services.bdd.spec.HapiSpec;
import com.hedera.services.bdd.spec.HapiSpecOperation;
Expand All @@ -36,7 +37,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

@HapiTestSuite
@HapiTestSuite(isolated = true)
public class UtilScalePricingCheck extends HapiSuite {

private static final Logger LOG = LogManager.getLogger(UtilScalePricingCheck.class);
Expand All @@ -54,7 +55,8 @@ public List<HapiSpec> getSpecsInSuite() {
}

// Can only be run against an isolated network since it assumes the state begins with 0 NFTs minted
final HapiSpec nftPriceScalesWithUtilization() {
@HapiTest
private HapiSpec nftPriceScalesWithUtilization() {
final var civilian = "civilian";
final var maxAllowed = 100;
final IntFunction<String> mintOp = i -> "mint" + i;
Expand Down
Loading