Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🌱 Add support for IRSO in e2e pipeline #950

Merged
merged 1 commit into from
Jan 21, 2025
Merged

🌱 Add support for IRSO in e2e pipeline #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions jenkins/jobs/dev_env_integration_tests.pipeline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,17 @@ pipeline {
UPDATED_BRANCH = "${env.PULL_PULL_SHA}"
BUILD_TAG = "${env.BUILD_TAG}"
PR_ID = "${env.PULL_NUMBER}"
IMAGE_OS = "${IMAGE_OS}"
CAPI_VERSION = "${CAPI_VERSION}"
CAPM3_VERSION = "${CAPM3_VERSION}"
CAPM3RELEASEBRANCH = "${capm3_release_branch}"
BMORELEASEBRANCH = "${bmo_release_branch}"
TARGET_NODE_MEMORY = "${TARGET_NODE_MEMORY}"
NUM_NODES=2
IRONIC_INSTALL_TYPE="${params.IRONIC_INSTALL_TYPE}"
IRONIC_USE_MARIADB="${params.IRONIC_USE_MARIADB}"
BUILD_MARIADB_IMAGE_LOCALLY="${params.BUILD_MARIADB_IMAGE_LOCALLY}"
IMAGE_OS = "${params.IMAGE_OS}"
CAPI_VERSION = "${params.CAPI_VERSION}"
CAPM3_VERSION = "${params.CAPM3_VERSION}"
CAPM3RELEASEBRANCH = "${params.capm3_release_branch}"
BMORELEASEBRANCH = "${params.bmo_release_branch}"
TARGET_NODE_MEMORY = "${params.TARGET_NODE_MEMORY}"
NUM_NODES = 2
IRONIC_INSTALL_TYPE = "${params.IRONIC_INSTALL_TYPE}"
IRONIC_USE_MARIADB = "${params.IRONIC_USE_MARIADB}"
BUILD_MARIADB_IMAGE_LOCALLY = "${params.BUILD_MARIADB_IMAGE_LOCALLY}"
USE_IRSO = "${params.USE_IRSO}"
}

stages {
Expand Down
1 change: 1 addition & 0 deletions jenkins/scripts/dynamic_worker_workflow/dev_env_integration_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export TARGET_NODE_MEMORY="${TARGET_NODE_MEMORY:-4096}"
export IRONIC_INSTALL_TYPE="${IRONIC_INSTALL_TYPE:-rpm}"
export IRONIC_FROM_SOURCE="${IRONIC_FROM_SOURCE:-false}"
export BUILD_IRONIC_IMAGE_LOCALLY=""
export USE_IRSO="${USE_IRSO:-false}"

if [[ "${IRONIC_INSTALL_TYPE}" == "source" ]]; then
IRONIC_FROM_SOURCE="true"
Expand Down
13 changes: 13 additions & 0 deletions prow/config/jobs/metal3-io/ironic-standalone-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,16 @@ presubmits:
value: "/"
image: ghcr.io/yannh/kubeconform:v0.6.7-alpine@sha256:824e0c248809e4b2da2a768b16b107cf17ada88a89ec6aa6050e566ba93ebbc6
imagePullPolicy: Always
# name: metal3-dev-env-integration-test-{image_os}-main
- name: metal3-dev-env-integration-test-ubuntu-main
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't these jobs set USE_IRSO?

Copy link
Member Author

Choose a reason for hiding this comment

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

Afaiu USE_IRSO should be set from jjb side, haven't seen any jenkins jobs setting its own env var in prow. But I'm not a prow pro 😄 Maybe @lentzi90 could help answering this?

Copy link
Member

Choose a reason for hiding this comment

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

Yes that should come from jjb. Prow will only trigger the jobs with whatever defaults they have

branches:
- main
agent: jenkins
always_run: false
optional: true
- name: metal3-dev-env-integration-test-centos-main
branches:
- main
agent: jenkins
always_run: false
optional: true
Loading