Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ tests:
steps:
test:
- ref: konflux-ci-install-operator
- ref: konflux-ci-e2e-tests
workflow: redhat-appstudio-claim
- always_run: false
as: konflux-e2e-v420-arm64-optional
Expand All @@ -53,6 +54,7 @@ tests:
steps:
test:
- ref: konflux-ci-install-operator
- ref: konflux-ci-e2e-tests
workflow: redhat-appstudio-claim
zz_generated_metadata:
branch: main
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ tests:
OCP_ARCH: arm64
test:
- ref: konflux-ci-install-operator
- ref: konflux-ci-e2e-tests
workflow: konflux-ci-ipi
zz_generated_metadata:
branch: main
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ tests:
cluster_profile: aws-konflux-qe
test:
- ref: konflux-ci-install-operator
- ref: konflux-ci-e2e-tests
workflow: konflux-ci-ipi
zz_generated_metadata:
branch: main
Expand Down
15 changes: 15 additions & 0 deletions ci-operator/step-registry/konflux-ci/e2e-tests/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
approvers:
- amisstea
- avi-biton
- cuipinghuo
- dheerajodha
- flacatus
- gbenhaim
- hmariset
- ifireball
- jinqi7
- kasemalem
- kelchen123
- psturc
- tisutisu
- yftacherzog
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

set -o nounset
set -o errexit
set -o pipefail

SECRETS_DIR=/usr/local/ci-secrets/konflux-ci-konflux-ci-e2e-tests-credentials

# Source the e2e env template to pick up defaults
source test/e2e/e2e.env.template

# Override e2e test credentials
export GH_TOKEN GH_ORG QUAY_DOCKERCONFIGJSON RELEASE_CATALOG_TA_QUAY_TOKEN GITHUB_TOKEN MY_GITHUB_ORG
GH_TOKEN=$(cat "${SECRETS_DIR}/github-token")
GH_ORG=$(cat "${SECRETS_DIR}/github-org")
QUAY_DOCKERCONFIGJSON=$(cat "${SECRETS_DIR}/quay-dockerconfigjson")
RELEASE_CATALOG_TA_QUAY_TOKEN=$(cat "${SECRETS_DIR}/release-catalog-ta-quay-token")
GITHUB_TOKEN="${GH_TOKEN}"
MY_GITHUB_ORG="${GH_ORG}"
# Not running with upstream dependencies — this is OCP
unset TEST_ENVIRONMENT

# Deploy test resources and run E2E conformance tests
./test/e2e/run-e2e.sh

Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"path": "konflux-ci/e2e-tests/konflux-ci-e2e-tests-ref.yaml",
"owners": {
"approvers": [
"amisstea",
"avi-biton",
"cuipinghuo",
"dheerajodha",
"flacatus",
"gbenhaim",
"hmariset",
"ifireball",
"jinqi7",
"kasemalem",
"kelchen123",
"psturc",
"tisutisu",
"yftacherzog"
]
}
}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recall during standup you mentioned the tests could take 1hr 30min or more; should the timeout be increased? If most of the time is for cluster provisioning it should be fine but just checking!

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That includes the cluster claim process and operator installation which have their own timeouts. The actual test suite has a 30m timeout declared within the run-e2e.sh script so the timeout here just needed to be a bit bigger than than. 1h is overkill but I think that's ok - the tests should fail faster.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
ref:
as: konflux-ci-e2e-tests
cli: latest
commands: konflux-ci-e2e-tests-commands.sh
from: src
timeout: 1h
grace_period: 1m
resources:
requests:
cpu: 100m
memory: 200Mi
credentials:
- mount_path: /usr/local/ci-secrets/konflux-ci-konflux-ci-e2e-tests-credentials
name: konflux-ci-konflux-ci-e2e-tests-credentials
namespace: test-credentials
documentation: |-
Deploys test resources and runs E2E conformance test suite from
konflux-ci/konflux-ci. Run after konflux-ci-install-operator.

Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ set -o nounset
set -o errexit
set -o pipefail

export GITHUB_APP_ID GITHUB_PRIVATE_KEY WEBHOOK_SECRET QUAY_TOKEN QUAY_ORGANIZATION
export GITHUB_APP_ID GITHUB_PRIVATE_KEY WEBHOOK_SECRET QUAY_TOKEN QUAY_ORGANIZATION SMEE_CHANNEL

GITHUB_APP_ID=$(cat /usr/local/ci-secrets/konflux-ci-konflux-ci-e2e-tests-credentials/github-app-id)
GITHUB_PRIVATE_KEY=$(cat /usr/local/ci-secrets/konflux-ci-konflux-ci-e2e-tests-credentials/github-private-key)
WEBHOOK_SECRET=$(cat /usr/local/ci-secrets/konflux-ci-konflux-ci-e2e-tests-credentials/webhook-secret)
QUAY_TOKEN=$(cat /usr/local/ci-secrets/konflux-ci-konflux-ci-e2e-tests-credentials/quay-token)
QUAY_ORGANIZATION=$(cat /usr/local/ci-secrets/konflux-ci-konflux-ci-e2e-tests-credentials/quay-org)
SMEE_CHANNEL=$(cat /usr/local/ci-secrets/konflux-ci-konflux-ci-e2e-tests-credentials/smee-channel)

echo "Installing Konflux on OpenShift..."

Expand Down