diff --git a/jenkins/jobs/dev_env_integration_tests.pipeline b/jenkins/jobs/dev_env_integration_tests.pipeline index 7b05283b6..4d2fb5ab9 100644 --- a/jenkins/jobs/dev_env_integration_tests.pipeline +++ b/jenkins/jobs/dev_env_integration_tests.pipeline @@ -24,11 +24,9 @@ pipeline { agent { label agent_label } environment { METAL3_CI_USER="metal3ci" - REPO_ORG = "${PROJECT_REPO_ORG}" - REPO_NAME = "${PROJECT_REPO_NAME}" - UPDATED_REPO = "${ghprbAuthorRepoGitUrl}" - REPO_BRANCH = "${ghprbTargetBranch}" - UPDATED_BRANCH = "${ghprbActualCommit}" + REPO_ORG = "${env.REPO_OWNER}" + REPO_NAME = "${env.REPO_NAME}" + REPO_BRANCH = "${env.PULL_BASE_REF}" BUILD_TAG = "${env.BUILD_TAG}" PR_ID = "${ghprbPullId}" IMAGE_OS = "${IMAGE_OS}" diff --git a/jenkins/scripts/dynamic_worker_workflow/dev_env_integration_tests.sh b/jenkins/scripts/dynamic_worker_workflow/dev_env_integration_tests.sh index 67ea59239..2892b7690 100755 --- a/jenkins/scripts/dynamic_worker_workflow/dev_env_integration_tests.sh +++ b/jenkins/scripts/dynamic_worker_workflow/dev_env_integration_tests.sh @@ -12,6 +12,8 @@ CI_DIR="$(dirname "$(readlink -f "${0}")")" export IMAGE_OS="${IMAGE_OS:-ubuntu}" export REPO_ORG="${REPO_ORG:-metal3-io}" export REPO_NAME="${REPO_NAME:-metal3-dev-env}" +export REPO_BRANCH="${REPO_BRANCH:-main}" +export PR_ID="${PR_ID:-0}" export METAL3REPO="${METAL3REPO:-https://github.com/metal3-io/metal3-dev-env.git}" export METAL3BRANCH="${METAL3BRANCH:-main}" export CAPM3RELEASEBRANCH="${CAPM3RELEASEBRANCH:-main}" diff --git a/prow/manifests/overlays/metal3/config.yaml b/prow/manifests/overlays/metal3/config.yaml index f48c078fd..087d47cf1 100644 --- a/prow/manifests/overlays/metal3/config.yaml +++ b/prow/manifests/overlays/metal3/config.yaml @@ -813,6 +813,39 @@ presubmits: agent: jenkins always_run: false optional: true + # name: {job_prefix}-{image_os}-dev-env-integration-test-{capm3_target_branch} + - name: metal3-centos-dev-env-integration-test-main + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-6 + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-5 + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-4 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-main + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-6 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-5 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-4 + agent: jenkins + always_run: false + optional: true metal3-io/cluster-api-provider-metal3: - name: gomod branches: @@ -1225,6 +1258,39 @@ presubmits: agent: jenkins always_run: false optional: true + # name: {job_prefix}-{image_os}-dev-env-integration-test-{capm3_target_branch} + - name: metal3-centos-dev-env-integration-test-main + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-6 + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-5 + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-4 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-main + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-6 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-5 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-4 + agent: jenkins + always_run: false + optional: true metal3-io/community: - name: markdownlint run_if_changed: '(\.md|markdownlint\.sh)$' @@ -1334,6 +1400,39 @@ presubmits: agent: jenkins always_run: false optional: true + # name: {job_prefix}-{image_os}-dev-env-integration-test-{capm3_target_branch} + - name: metal3-centos-dev-env-integration-test-main + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-6 + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-5 + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-4 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-main + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-6 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-5 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-4 + agent: jenkins + always_run: false + optional: true metal3-io/project-infra: - name: check-prow-config skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$' @@ -1463,6 +1562,39 @@ presubmits: agent: jenkins always_run: false optional: true + # name: {job_prefix}-{image_os}-dev-env-integration-test-{capm3_target_branch} + - name: metal3-centos-dev-env-integration-test-main + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-6 + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-5 + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-4 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-main + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-6 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-5 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-4 + agent: jenkins + always_run: false + optional: true metal3-io/metal3-docs: - name: markdownlint run_if_changed: '(\.md|markdownlint\.sh)$' @@ -1843,6 +1975,39 @@ presubmits: agent: jenkins always_run: false optional: true + # name: {job_prefix}-{image_os}-dev-env-integration-test-{capm3_target_branch} + - name: metal3-centos-dev-env-integration-test-main + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-6 + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-5 + agent: jenkins + always_run: false + optional: true + - name: metal3-centos-dev-env-integration-test-release-1-4 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-main + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-6 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-5 + agent: jenkins + always_run: false + optional: true + - name: metal3-ubuntu-dev-env-integration-test-release-1-4 + agent: jenkins + always_run: false + optional: true metal3-io/ironic-ipa-downloader: - name: shellcheck run_if_changed: '((\.sh)|^Makefile)$'