From 5d1cefad0ea0d37fb08e9aec7847080745c83f9c Mon Sep 17 00:00:00 2001 From: Junkil Park Date: Fri, 16 Feb 2024 13:22:04 -0800 Subject: [PATCH] Resolved the `framework_upgrade` CI test failure (#12046) * Update release.yaml * Update release.yaml * corrected the base node version --------- Co-authored-by: Alden Hu --- .github/workflows/docker-build-test.yaml | 4 ++-- aptos-move/aptos-release-builder/data/release.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-build-test.yaml b/.github/workflows/docker-build-test.yaml index 36d3a9f323b9e..f5525d7fb1027 100644 --- a/.github/workflows/docker-build-test.yaml +++ b/.github/workflows/docker-build-test.yaml @@ -302,7 +302,7 @@ jobs: with: GIT_SHA: ${{ needs.determine-docker-build-metadata.outputs.gitSha }} FORGE_TEST_SUITE: compat - IMAGE_TAG: testnet # test against a previous testnet release + IMAGE_TAG: aptos-node-v1.9.5 # test against a previous testnet release FORGE_RUNNER_DURATION_SECS: 300 COMMENT_HEADER: forge-compat FORGE_NAMESPACE: forge-compat-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }} @@ -329,7 +329,7 @@ jobs: with: GIT_SHA: ${{ needs.determine-docker-build-metadata.outputs.gitSha }} FORGE_TEST_SUITE: framework_upgrade - IMAGE_TAG: aptos-node-v1.8.3 # This workflow will test the upgradability from the current tip of the release branch to the current main branch. + IMAGE_TAG: aptos-node-v1.9.5 # This workflow will test the upgradability from the current tip of the release branch to the current main branch. FORGE_RUNNER_DURATION_SECS: 3600 COMMENT_HEADER: forge-framework-upgrade FORGE_NAMESPACE: forge-framework-upgrade-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }} diff --git a/aptos-move/aptos-release-builder/data/release.yaml b/aptos-move/aptos-release-builder/data/release.yaml index 2664c71994803..46d9f66996cb1 100644 --- a/aptos-move/aptos-release-builder/data/release.yaml +++ b/aptos-move/aptos-release-builder/data/release.yaml @@ -33,9 +33,9 @@ proposals: - refundable_bytes - name: step_4_enable_fairness_shuffler metadata: - title: "Enable Fairness Shuffler" - description: "FairnessShuffler that tries to spread out (delay) transactions from dominant modules in a block, so that if block limit is hit, transactions from non-dominant modules have a fair share of the block space." - discussion_url: "TBA" + title: "AIP-68: Reordering transactions in a block for fairness" + description: "AIP-68: This AIP proposes to update the Transaction Shuffler logic to add other aspects of fairness to how transactions are ordered in the block." + discussion_url: "https://github.com/aptos-foundation/AIPs/issues/333" execution_mode: MultiStep update_sequence: - Execution: @@ -106,7 +106,7 @@ proposals: update_sequence: - FeatureFlag: enabled: - - aggregator_v2_delayed_fields + - aggregator_v2_delayed_fields - resource_groups_split_in_vm_change_set - name: step_10_enable_validator_txn metadata: