From e6fef2cc605332ccff691a0adc89ac2a308cd1f9 Mon Sep 17 00:00:00 2001 From: Jos Date: Wed, 26 Feb 2025 15:21:57 +0800 Subject: [PATCH 1/5] set output_remove_retry_attempts to false --- .buildkite/pipeline.yml | 148 ++++++++++++++++++++-------------------- fastlane/Fastfile | 2 +- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index ce734252301..712ed066afb 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -23,93 +23,93 @@ steps: ################# # Create Prototype Build ################# - - label: ":hammer_and_wrench: Prototype Build" - command: .buildkite/commands/prototype-build.sh - plugins: [$CI_TOOLKIT] - if: build.pull_request.id != null - notify: - - github_commit_status: - context: Prototype Build + # - label: ":hammer_and_wrench: Prototype Build" + # command: .buildkite/commands/prototype-build.sh + # plugins: [$CI_TOOLKIT] + # if: build.pull_request.id != null + # notify: + # - github_commit_status: + # context: Prototype Build ################# # Run Unit Tests ################# - - label: ":microscope: Unit Tests" - command: .buildkite/commands/run-unit-tests.sh - depends_on: build - plugins: [$CI_TOOLKIT] - artifact_paths: - - fastlane/test_output/* - notify: - - github_commit_status: - context: Unit Tests + # - label: ":microscope: Unit Tests" + # command: .buildkite/commands/run-unit-tests.sh + # depends_on: build + # plugins: [$CI_TOOLKIT] + # artifact_paths: + # - fastlane/test_output/* + # notify: + # - github_commit_status: + # context: Unit Tests - - label: ":microscope: Standalone WordPressAuthenticator Unit Tests" - command: | - echo "--- :rubygems: Setting up Gems" - install_gems + # - label: ":microscope: Standalone WordPressAuthenticator Unit Tests" + # command: | + # echo "--- :rubygems: Setting up Gems" + # install_gems - echo "--- :cocoapods: Setting up Pods" - install_cocoapods + # echo "--- :cocoapods: Setting up Pods" + # install_cocoapods - echo "--- :swift: Setting up Swift Packages" - install_swiftpm_dependencies + # echo "--- :swift: Setting up Swift Packages" + # install_swiftpm_dependencies - echo "--- 🧪 Testing" - bundle exec fastlane run scan \ - scheme:WordPressAuthenticator \ - prelaunch_simulator:true \ - device:'iPhone 16' - plugins: [$CI_TOOLKIT] - artifact_paths: - - fastlane/test_output/* - notify: - - github_commit_status: - context: WordPressAuthenticator Unit Tests + # echo "--- 🧪 Testing" + # bundle exec fastlane run scan \ + # scheme:WordPressAuthenticator \ + # prelaunch_simulator:true \ + # device:'iPhone 16' + # plugins: [$CI_TOOLKIT] + # artifact_paths: + # - fastlane/test_output/* + # notify: + # - github_commit_status: + # context: WordPressAuthenticator Unit Tests ################# # Linters ################# - - group: Linters - steps: - - label: ":radioactive_sign: Danger - PR Check" - command: danger - key: danger - if: build.pull_request.id != null - retry: - manual: - permit_on_passed: true - agents: - queue: linter - notify: - - github_commit_status: - context: Danger - PR Check + # - group: Linters + # steps: + # - label: ":radioactive_sign: Danger - PR Check" + # command: danger + # key: danger + # if: build.pull_request.id != null + # retry: + # manual: + # permit_on_passed: true + # agents: + # queue: linter + # notify: + # - github_commit_status: + # context: Danger - PR Check - - label: ":swift: SwiftLint" - command: swiftlint - notify: - - github_commit_status: - context: SwiftLint - agents: - queue: linter + # - label: ":swift: SwiftLint" + # command: swiftlint + # notify: + # - github_commit_status: + # context: SwiftLint + # agents: + # queue: linter - - label: 🧹 Lint Translations - command: gplint /workdir/WooCommerce/Resources/AppStoreStrings.pot - plugins: - - docker#v3.8.0: - image: public.ecr.aws/automattic/glotpress-validator:1.0.0 - agents: - queue: default - notify: - - github_commit_status: - context: Lint Translations + # - label: 🧹 Lint Translations + # command: gplint /workdir/WooCommerce/Resources/AppStoreStrings.pot + # plugins: + # - docker#v3.8.0: + # image: public.ecr.aws/automattic/glotpress-validator:1.0.0 + # agents: + # queue: default + # notify: + # - github_commit_status: + # context: Lint Translations - - label: ":sleuth_or_spy: Lint Localized Strings Format" - command: .buildkite/commands/lint-localized-strings-format.sh - plugins: [$CI_TOOLKIT] - notify: - - github_commit_status: - context: Lint Localized Strings Format + # - label: ":sleuth_or_spy: Lint Localized Strings Format" + # command: .buildkite/commands/lint-localized-strings-format.sh + # plugins: [$CI_TOOLKIT] + # notify: + # - github_commit_status: + # context: Lint Localized Strings Format ################# # UI Tests @@ -118,7 +118,7 @@ steps: command: .buildkite/commands/run-ui-tests.sh UITests 'iPhone 16' depends_on: build # Only run on `trunk` and `release/*` -- See p91TBi-cBM-p2#comment-13736 - if: build.branch == 'trunk' || build.branch =~ /^release\// + # if: build.branch == 'trunk' || build.branch =~ /^release\// plugins: [$CI_TOOLKIT] artifact_paths: - fastlane/test_output/* @@ -130,7 +130,7 @@ steps: command: .buildkite/commands/run-ui-tests.sh UITests "iPad (10th generation)" depends_on: build # Only run on `trunk` and `release/*` -- See p91TBi-cBM-p2#comment-13736 - if: build.branch == 'trunk' || build.branch =~ /^release\// + # if: build.branch == 'trunk' || build.branch =~ /^release\// plugins: [$CI_TOOLKIT] artifact_paths: - fastlane/test_output/* diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 4587e696208..13c42dc3dfc 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1321,7 +1321,7 @@ lane :test_without_building do |options| trainer( path: lane_context[SharedValues::SCAN_GENERATED_XCRESULT_PATH], - output_remove_retry_attempts: true, + output_remove_retry_attempts: false, fail_build: true ) From dfa687e5bbb4d0163fe9f79c6148d5e0dd9f1d3c Mon Sep 17 00:00:00 2001 From: Jos Date: Wed, 26 Feb 2025 16:09:20 +0800 Subject: [PATCH 2/5] temp - set parallelism to 2 --- .buildkite/pipeline.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 712ed066afb..9cf9dd32ad2 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -119,6 +119,7 @@ steps: depends_on: build # Only run on `trunk` and `release/*` -- See p91TBi-cBM-p2#comment-13736 # if: build.branch == 'trunk' || build.branch =~ /^release\// + parallelism: 2 plugins: [$CI_TOOLKIT] artifact_paths: - fastlane/test_output/* @@ -131,6 +132,7 @@ steps: depends_on: build # Only run on `trunk` and `release/*` -- See p91TBi-cBM-p2#comment-13736 # if: build.branch == 'trunk' || build.branch =~ /^release\// + parallelism: 2 plugins: [$CI_TOOLKIT] artifact_paths: - fastlane/test_output/* From 4adb1c0cc0ea67e114b06a10dcd7e5e5a1538f5e Mon Sep 17 00:00:00 2001 From: Jos Date: Wed, 26 Feb 2025 17:15:02 +0800 Subject: [PATCH 3/5] Revert "temp - set parallelism to 2" This reverts commit dfa687e5bbb4d0163fe9f79c6148d5e0dd9f1d3c. --- .buildkite/pipeline.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 9cf9dd32ad2..712ed066afb 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -119,7 +119,6 @@ steps: depends_on: build # Only run on `trunk` and `release/*` -- See p91TBi-cBM-p2#comment-13736 # if: build.branch == 'trunk' || build.branch =~ /^release\// - parallelism: 2 plugins: [$CI_TOOLKIT] artifact_paths: - fastlane/test_output/* @@ -132,7 +131,6 @@ steps: depends_on: build # Only run on `trunk` and `release/*` -- See p91TBi-cBM-p2#comment-13736 # if: build.branch == 'trunk' || build.branch =~ /^release\// - parallelism: 2 plugins: [$CI_TOOLKIT] artifact_paths: - fastlane/test_output/* From 7d63d3bb1375bb52987d08677975fbd342b43f59 Mon Sep 17 00:00:00 2001 From: Jos Date: Wed, 26 Feb 2025 17:15:10 +0800 Subject: [PATCH 4/5] make test fail --- .../Screens/Payments/CardReaderManualsScreen.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/WooCommerce/UITestsFoundation/Screens/Payments/CardReaderManualsScreen.swift b/WooCommerce/UITestsFoundation/Screens/Payments/CardReaderManualsScreen.swift index 12329a1c5d1..43be322dadc 100644 --- a/WooCommerce/UITestsFoundation/Screens/Payments/CardReaderManualsScreen.swift +++ b/WooCommerce/UITestsFoundation/Screens/Payments/CardReaderManualsScreen.swift @@ -34,10 +34,13 @@ public final class CardReaderManualsScreen: ScreenObject { @discardableResult public func verifyChipperManualLoadedInWebView() throws -> Self { - let chipperManualPredicate = NSPredicate(format: "label CONTAINS[c] %@", "ChipperTM 2X BT") +// let chipperManualPredicate = NSPredicate(format: "label CONTAINS[c] %@", "ChipperTM 2X BT") + let chipperManualPredicate = NSPredicate(format: "label CONTAINS[c] %@", "TO FAIL TEST") let chipperManualText = app.webViews.textViews.containing(chipperManualPredicate).element - XCTAssert(chipperManualText.waitForExistence(timeout: 30), "Chipper manual not displayed on WebView!") +// XCTAssert(chipperManualText.waitForExistence(timeout: 30), "Chipper manual not displayed on WebView!") + XCTAssert(chipperManualText.waitForExistence(timeout: 5), "Chipper manual not displayed on WebView!") + return self } } From 5016317b632d4a7145bfd9eabe2a515b9c56091b Mon Sep 17 00:00:00 2001 From: Jos Date: Wed, 26 Feb 2025 17:42:58 +0800 Subject: [PATCH 5/5] set output_remove_retry_attempts: true --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 13c42dc3dfc..4587e696208 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1321,7 +1321,7 @@ lane :test_without_building do |options| trainer( path: lane_context[SharedValues::SCAN_GENERATED_XCRESULT_PATH], - output_remove_retry_attempts: false, + output_remove_retry_attempts: true, fail_build: true )