Skip to content
Draft
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 @@ -48,10 +48,64 @@ tests:
cloud: aws
owner: openshift-ci
product: ocp
timeout: 1h0m0s
timeout: 2h0m0s
version: "4.20"
run_if_changed: ^(cost-onprem/|scripts/|tests/|openshift-values\.yaml)
steps:
env:
IQE_PROFILE: smoke
RUN_IQE: "true"
test:
- ref: insights-onprem-cost-onprem-chart-e2e
workflow: insights-onprem-cost-onprem-chart-claim
- as: e2e-iqe-extended
cluster_claim:
architecture: amd64
cloud: aws
owner: openshift-ci
product: ocp
timeout: 2h0m0s
version: "4.20"
optional: true
skip_if_only_changed: ^docs/|\.md$|^\.github/
steps:
env:
IQE_PROFILE: extended
RUN_IQE: "true"
test:
- ref: insights-onprem-cost-onprem-chart-e2e
workflow: insights-onprem-cost-onprem-chart-claim
- as: e2e-iqe-stable
cluster_claim:
architecture: amd64
cloud: aws
owner: openshift-ci
product: ocp
timeout: 2h0m0s
version: "4.20"
optional: true
skip_if_only_changed: ^docs/|\.md$|^\.github/
steps:
env:
IQE_PROFILE: stable
RUN_IQE: "true"
test:
- ref: insights-onprem-cost-onprem-chart-e2e
workflow: insights-onprem-cost-onprem-chart-claim
- as: e2e-iqe-full
cluster_claim:
architecture: amd64
cloud: aws
owner: openshift-ci
product: ocp
timeout: 4h0m0s
version: "4.20"
optional: true
skip_if_only_changed: ^docs/|\.md$|^\.github/
steps:
env:
IQE_PROFILE: full
RUN_IQE: "true"
test:
- ref: insights-onprem-cost-onprem-chart-e2e
workflow: insights-onprem-cost-onprem-chart-claim
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,243 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^main$
- ^main-
cluster: build06
context: ci/prow/e2e-iqe-extended
decorate: true
decoration_config:
skip_cloning: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-insights-onprem-cost-onprem-chart-main-e2e-iqe-extended
optional: true
rerun_command: /test e2e-iqe-extended
skip_if_only_changed: ^docs/|\.md$|^\.github/
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-iqe-extended
command:
- ci-operator
env:
- name: HTTP_SERVER_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
imagePullPolicy: Always
name: ""
ports:
- containerPort: 8080
name: http
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/hive-hive-credentials
name: hive-hive-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: hive-hive-credentials
secret:
secretName: hive-hive-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-iqe-extended,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^main$
- ^main-
cluster: build06
context: ci/prow/e2e-iqe-full
decorate: true
decoration_config:
skip_cloning: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-insights-onprem-cost-onprem-chart-main-e2e-iqe-full
optional: true
rerun_command: /test e2e-iqe-full
skip_if_only_changed: ^docs/|\.md$|^\.github/
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-iqe-full
command:
- ci-operator
env:
- name: HTTP_SERVER_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
imagePullPolicy: Always
name: ""
ports:
- containerPort: 8080
name: http
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/hive-hive-credentials
name: hive-hive-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: hive-hive-credentials
secret:
secretName: hive-hive-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-iqe-full,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^main$
- ^main-
cluster: build06
context: ci/prow/e2e-iqe-stable
decorate: true
decoration_config:
skip_cloning: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-insights-onprem-cost-onprem-chart-main-e2e-iqe-stable
optional: true
rerun_command: /test e2e-iqe-stable
skip_if_only_changed: ^docs/|\.md$|^\.github/
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-iqe-stable
command:
- ci-operator
env:
- name: HTTP_SERVER_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
imagePullPolicy: Always
name: ""
ports:
- containerPort: 8080
name: http
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/hive-hive-credentials
name: hive-hive-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: hive-hive-credentials
secret:
secretName: hive-hive-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-iqe-stable,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,46 @@ if [ "${DEPLOY_S4:-false}" == "true" ]; then
DEPLOY_ARGS+=(--s4-namespace "${S4_NAMESPACE:-${NAMESPACE}}")
fi

# Add IQE test flags if enabled
if [ "${RUN_IQE:-false}" == "true" ]; then
echo "IQE tests enabled with profile: ${IQE_PROFILE:-smoke}"
DEPLOY_ARGS+=(--run-iqe)
DEPLOY_ARGS+=(--iqe-profile "${IQE_PROFILE:-smoke}")
DEPLOY_ARGS+=(--listener-cpu "${LISTENER_CPU:-max}")

# Set up Quay pull secret for IQE image
SECRETS_DIR="/tmp/secrets/ci"
if [[ -f "${SECRETS_DIR}/username" ]] && [[ -f "${SECRETS_DIR}/password" ]]; then
echo "Creating Quay pull secret for IQE image..."
# Disable tracing due to password handling
[[ $- == *x* ]] && WAS_TRACING=true || WAS_TRACING=false
set +x
QUAY_USER=$(cat "${SECRETS_DIR}/username")
QUAY_PASS=$(cat "${SECRETS_DIR}/password")
oc create secret docker-registry iqe-pull-secret \
--docker-server=quay.io \
--docker-username="${QUAY_USER}" \
--docker-password="${QUAY_PASS}" \
-n "${NAMESPACE}" \
--dry-run=client -o yaml | oc apply -f -
$WAS_TRACING && set -x
echo "Quay pull secret created"
else
echo "WARNING: Quay credentials not found at ${SECRETS_DIR}, IQE image pull may fail"
fi
fi

# Run the deployment script from the chart repo source
# The step runs with from: src, so we're already in the chart repo
# Use bash to execute since source may be read-only (can't chmod)
bash ./scripts/deploy-test-cost-onprem.sh "${DEPLOY_ARGS[@]}"

# Copy IQE test artifacts to CI artifact directory if they exist
if [ "${RUN_IQE:-false}" == "true" ] && [ -d "./tests/reports" ]; then
echo "Collecting IQE test artifacts..."
cp -r ./tests/reports/* "${ARTIFACT_DIR}/" 2>/dev/null || true
# Rename junit file for CI recognition
if [ -f "${ARTIFACT_DIR}/iqe_junit.xml" ]; then
mv "${ARTIFACT_DIR}/iqe_junit.xml" "${ARTIFACT_DIR}/junit_iqe.xml"
fi
fi
Loading