From da87ed9fb4e868d4a7eaed174927c33c2a0c0a40 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Wed, 6 Mar 2024 23:23:31 +0800 Subject: [PATCH 1/4] test: update integration README Signed-off-by: Xiaofeng Wang Signed-off-by: Colin Walters --- tests/integration/README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/integration/README.md b/tests/integration/README.md index bf061b94..1b61ac2f 100644 --- a/tests/integration/README.md +++ b/tests/integration/README.md @@ -30,7 +30,6 @@ Run `testing-farm` CLI from `quay.io/testing-farm/cli` container. Don't forget e --environment AWS_REGION=us-east-1 \ --secret DOWNLOAD_NODE=$DOWNLOAD_NODE \ --secret RHEL_REGISTRY_URL=$RHEL_REGISTRY_URL \ - --secret CERT_URL=$CERT_URL \ --secret QUAY_USERNAME=$QUAY_USERNAME \ --secret QUAY_PASSWORD=$QUAY_PASSWORD \ --secret QUAY_SECRET=$QUAY_SECRET \ @@ -62,7 +61,6 @@ Run `testing-farm` CLI from `quay.io/testing-farm/cli` container. Don't forget e QUAY_SECRET Save into /etc/ostree/auth.json for authenticated registry DOWNLOAD_NODE RHEL nightly compose download URL RHEL_REGISTRY_URL RHEL bootc image URL - CERT_URL CA certificate download URL AWS_ACCESS_KEY_ID AWS access key id AWS_SECRET_ACCESS_KEY AWS secrety key AWS_REGION AWS region From 1a28501a6432e495202e6d3bde6d074f4b16ab06 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 6 Mar 2024 16:41:12 -0500 Subject: [PATCH 2/4] tests: Explicitly pull image before install And add a retry loop. Signed-off-by: Colin Walters --- tests/integration/playbooks/install.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/integration/playbooks/install.yaml b/tests/integration/playbooks/install.yaml index 3b024d3f..cb213be4 100644 --- a/tests/integration/playbooks/install.yaml +++ b/tests/integration/playbooks/install.yaml @@ -54,6 +54,14 @@ no_log: true become: true + - name: Pull image + command: "podman pull {{ test_image_url }}" + become: true + retries: 3 + delay: 10 + register: result + until: result is successful + - name: Install image command: "podman run \ From 09970d9b112ba45c32e4dc966eb4857cba1e22d5 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 6 Mar 2024 16:41:29 -0500 Subject: [PATCH 3/4] tests: Bump install timeout Not sure what was going wrong, we really need to collect the logs in this scenario instead of a hard timeout. Signed-off-by: Colin Walters --- tests/integration/install-upgrade.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/install-upgrade.fmf b/tests/integration/install-upgrade.fmf index 9908cd26..66a33b54 100644 --- a/tests/integration/install-upgrade.fmf +++ b/tests/integration/install-upgrade.fmf @@ -6,4 +6,4 @@ /bootc-install-upgrade: summary: bootc install and upgrade test test: ./install-upgrade.sh - duration: 40m + duration: 90m From 56d9802e524ae34f40c55af48409bcbe54b7d586 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Thu, 7 Mar 2024 11:08:33 +0800 Subject: [PATCH 4/4] test: do not use testing farm to update PR status Github has job status update. Same job will have two status if testing farm updates PR status. That does not make sense. Github job status update can't be disabled, so testing farm PR job status update has to be disabled. Signed-off-by: Xiaofeng Wang --- .github/workflows/integration.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 3aaa3548..e8a0426c 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -79,8 +79,6 @@ jobs: git_ref: ${{ needs.pr-info.outputs.ref }} arch: ${{ matrix.arch }} tmt_context: "arch=${{ matrix.arch }}" - update_pull_request_status: true - pull_request_status_name: "Integration-rhel94-${{ matrix.arch }}-${{ matrix.platform }}" tmt_plan_regex: "${{ matrix.platform }}" tf_scope: private secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};QUAY_SECRET=${{ secrets.QUAY_SECRET }};RHEL_REGISTRY_URL=${{ secrets.RHEL_REGISTRY_URL }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}" @@ -112,8 +110,6 @@ jobs: git_ref: ${{ needs.pr-info.outputs.ref }} arch: ${{ matrix.arch }} tmt_context: "arch=${{ matrix.arch }}" - update_pull_request_status: true - pull_request_status_name: "Integration-cs9-dev-${{ matrix.arch }}-${{ matrix.platform }}" tmt_plan_regex: "${{ matrix.platform }}" tf_scope: private secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};QUAY_SECRET=${{ secrets.QUAY_SECRET }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}"