Merge "Add jjbs to trigger e2e intergration from prow"
diff --git a/jjb/metal3/defaults.yml b/jjb/metal3/defaults.yml
index 9a35553..f24c7f8 100644
--- a/jjb/metal3/defaults.yml
+++ b/jjb/metal3/defaults.yml
@@ -34,7 +34,9 @@
ci_github_repo: 'https://github.com/metal3-io/project-infra.git'
ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline'
e2e_feature_test_parallel_pipeline: 'jenkins/jobs/parallel_e2e_features_test.pipeline'
+ e2e_feature_test_pipeline: 'jenkins/jobs/capm3-e2e-tests.pipeline'
ci_github_jenkins_credentials_id: 'metal3-jenkins-github-username-token'
+ dev_env_integration_test_pipeline: 'jenkins/jobs/dev_env_integration_tests.pipeline'
# NOTE: auth-id is taken from Jenkins Global Configuration (NOT THE CREDENTIAL STORE!)
# by clicking Auth ID button for the desired GitHub Server API URL
# Please ensure you are looking at GitHub Pull Request Builder part
diff --git a/jjb/metal3/job_capm3_clusterctl_upgrade_tests.yml b/jjb/metal3/job_capm3_clusterctl_upgrade_tests.yml
new file mode 100644
index 0000000..8dc3fea
--- /dev/null
+++ b/jjb/metal3/job_capm3_clusterctl_upgrade_tests.yml
@@ -0,0 +1,123 @@
+---
+#
+# ============LICENSE_START=======================================================
+# Copyright (C) 2024 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+# Description:
+# ============
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e clusterctl upgrade tests.
+# This job can be triggered manually or through a Github pull request. It creates a
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
+
+- job-template:
+ id: capm3_clusterctl_upgrade_tests
+ name: '{job_prefix}_{proj}_{capm3_target_branch}_clusterctl_upgrade_test_{image_os}'
+ description: "CAPM3 e2e clusterctl upgrade tests for {org}/{repo} on {image_os}."
+ project-type: pipeline
+ defaults: global
+ disabled: False
+ concurrent: True
+ parameters:
+ - string:
+ name: PROJECT_REPO_ORG
+ default: '{org}'
+ description: 'Project github repo org name'
+ - string:
+ name: PROJECT_REPO_NAME
+ default: '{repo}'
+ description: 'Project github repo name'
+ - string:
+ name: ghprbActualCommit
+ default: 'main'
+ description: 'CI Repo branch for triggering manual build'
+ - string:
+ name: ghprbAuthorRepoGitUrl
+ default: 'https://github.com/{org}/{repo}.git'
+ description: 'CI Repo URL for triggering manual build'
+ - string:
+ name: ghprbTargetBranch
+ default: 'main'
+ description: 'Target branch of the PR'
+ - string:
+ name: IMAGE_OS
+ default: '{image_os}'
+ description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
+ - string:
+ name: capm3_release_branch
+ default: '{capm3_release_branch}'
+ description: 'The target branch of CAPM3 to be used for this test'
+ - string:
+ name: bmo_release_branch
+ default: '{bmo_release_branch}'
+ description: 'The target branch of BMO to be used for this test'
+ - string:
+ name: TARGET_NODE_MEMORY
+ default: 4096
+ description: 'RAM size of the target host.'
+ - string:
+ name: TESTS_FOR
+ default: "e2e_tests"
+ description: 'Tests using the e2e framework.'
+ - string:
+ name: GINKGO_FOCUS
+ default: "clusterctl-upgrade"
+ description: 'Select the e2e upgrade test'
+ properties:
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 300
+ artifact-days-to-keep: -1
+ artifact-num-to-keep: -1
+ - github:
+ url: https://github.com/{org}/{repo}
+
+ triggers:
+ - github-pull-request:
+ admin-list:
+ - '{ci_github_admin_user}'
+ org-list: "{ci_github_whitelist_org}"
+ cron: 'H/5 * * * *'
+ auth-id: "{ci_ghprb_auth_id}"
+ trigger-phrase: '.*?/test-upgrade-{capm3_target_branch}.*?'
+ skip-build-phrase: '/skip-test'
+ only-trigger-phrase: True
+ github-hooks: True
+ permit-all: False
+ auto-close-on-fail: False
+ allow-whitelist-orgs-as-admins: True
+ white-list-target-branches:
+ - 'main'
+ status-context: "test-e2e-upgrade-{capm3_target_branch}"
+ success-status: "Passed"
+ failure-status: "Failed"
+ error-status: "Error"
+ cancel-builds-on-update: True
+ pipeline-scm:
+ scm:
+ - git:
+ url: "{ci_github_repo}"
+ credentials-id: "{ci_github_jenkins_credentials_id}"
+ branches:
+ - '{branch|main}'
+ name: 'origin'
+ refspec: '+refs/heads/*:refs/remotes/origin/*'
+ wipe-workspace: True
+ honor-refspec: True
+ shallow-clone: False
+ script-path: "{e2e_feature_test_pipeline}"
+ lightweight-checkout: False
diff --git a/jjb/metal3/job_dev_env_integration_tests.yml b/jjb/metal3/job_dev_env_integration_tests.yml
new file mode 100644
index 0000000..6a4dc89
--- /dev/null
+++ b/jjb/metal3/job_dev_env_integration_tests.yml
@@ -0,0 +1,133 @@
+---
+#
+# ============LICENSE_START=======================================================
+# Copyright (C) 2024 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+# Description:
+# ============
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) integration tests.
+# This job can be triggered manually or through a Github pull request. It creates a
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
+
+- job-template:
+ id: dev_env_integration_tests
+ name: '{job_prefix}_{proj}_{capm3_target_branch}_dev_env_integration_test_{image_os}{name_postfix}'
+ description: "CAPM3 {capm3_version} integration tests for {org}/{repo} on {image_os} with ironic installed from {ironic_install_type}."
+ project-type: pipeline
+ defaults: integration-default-values
+ disabled: False
+ concurrent: True
+ parameters:
+ - string:
+ name: PROJECT_REPO_ORG
+ default: '{org}'
+ description: 'Project github repo org name'
+ - string:
+ name: PROJECT_REPO_NAME
+ default: '{repo}'
+ description: 'Project github repo name'
+ - string:
+ name: ghprbActualCommit
+ default: 'main'
+ description: 'CI Repo branch for triggering manual build'
+ - string:
+ name: ghprbAuthorRepoGitUrl
+ default: 'https://github.com/{org}/{repo}.git'
+ description: 'CI Repo URL for triggering manual build'
+ - string:
+ name: ghprbTargetBranch
+ default: 'main'
+ description: 'Target branch of the PR'
+ - string:
+ name: capm3_release_branch
+ default: '{capm3_release_branch}'
+ description: 'The target branch of CAPM3 to be used for this test'
+ - string:
+ name: bmo_release_branch
+ default: '{bmo_release_branch}'
+ description: 'The target branch of BMO to be used for this test'
+ - string:
+ name: IMAGE_OS
+ default: '{image_os}'
+ description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
+ - string:
+ name: CAPI_VERSION
+ default: '{capi_version}'
+ description: 'Cluster API version.'
+ - string:
+ name: CAPM3_VERSION
+ default: '{capm3_version}'
+ description: 'Cluster API provider Metal3 version.'
+ - string:
+ name: TARGET_NODE_MEMORY
+ default: 4096
+ description: 'RAM size of the target host.'
+ - string:
+ name: IRONIC_INSTALL_TYPE
+ default: '{ironic_install_type}'
+ description: 'Sets the installation type of ironic during ironic-image build of the BMO deployment'
+ - string:
+ name: IRONIC_USE_MARIADB
+ default: '{ironic_use_mariadb}'
+ description: 'If Ironic should use MariaDB or not.'
+ - string:
+ name: BUILD_MARIADB_IMAGE_LOCALLY
+ default: '{build_mariadb_image_locally}'
+ properties:
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 300
+ artifact-days-to-keep: -1
+ artifact-num-to-keep: -1
+ - github:
+ url: https://github.com/{org}/{repo}
+
+ triggers:
+ - github-pull-request:
+ admin-list:
+ - '{ci_github_admin_user}'
+ org-list: "{ci_github_whitelist_org}"
+ cron: 'H/5 * * * *'
+ auth-id: "{ci_ghprb_auth_id}"
+ trigger-phrase: '((.|\n)*\s)?/test-{image_os}-dev-env-integration-{capm3_target_branch}{trigger_postfix}(\s(.|\n)*)?'
+ skip-build-phrase: '/skip-test'
+ only-trigger-phrase: True
+ github-hooks: True
+ permit-all: False
+ auto-close-on-fail: False
+ allow-whitelist-orgs-as-admins: True
+ white-list-target-branches: "{target_branches}"
+ status-context: "test-{image_os}-dev-env-integration-{capm3_target_branch}"
+ success-status: "Passed"
+ failure-status: "Failed"
+ error-status: "Error"
+ cancel-builds-on-update: True
+ pipeline-scm:
+ scm:
+ - git:
+ url: "{ci_github_repo}"
+ credentials-id: "{ci_github_jenkins_credentials_id}"
+ branches:
+ - '{branch|main}'
+ name: 'origin'
+ refspec: '+refs/heads/*:refs/remotes/origin/*'
+ wipe-workspace: True
+ honor-refspec: True
+ shallow-clone: False
+ script-path: "{dev_env_integration_test_pipeline}"
+ lightweight-checkout: False
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 5849365..ec3707d 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -418,6 +418,39 @@
target_branches:
- 'release-1.4'
- 'release-0.3'
+ - capm3_clusterctl_upgrade_tests:
+ capm3_target_branch:
+ - main:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: main
+ bmo_release_branch: main
+ target_branches:
+ - 'main'
+ - release-1-6:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.6
+ bmo_release_branch: release-0.5
+ target_branches:
+ - 'release-1.6'
+ - 'release-0.5'
+ - release-1-5:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.5
+ bmo_release_branch: release-0.4
+ target_branches:
+ - 'release-1.5'
+ - 'release-0.4'
+ - release-1-4:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.4
+ bmo_release_branch: release-0.3
+ target_branches:
+ - 'release-1.4'
+ - 'release-0.3'
- keep_capm3_e2e_integration_tests:
capm3_target_branch:
- main:
@@ -849,3 +882,71 @@
ci_github_jenkins_credentials_id: 'nordix-metal3-ci-github-prod-token'
ci_ghprb_auth_id: '86c49704-5474-4524-97b7-805323b2c39a'
ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
+
+- project:
+ name: dev-env-integration-tests
+ org: metal3-io
+ proj:
+ - metal3_dev_env:
+ repo: metal3-dev-env
+ - project_infra:
+ repo: project-infra
+ branch: '${{ghprbActualCommit}}'
+ ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
+ - capm3:
+ repo: cluster-api-provider-metal3
+ - bmo:
+ repo: baremetal-operator
+ - ipam:
+ repo: ip-address-manager
+ - ironic_image:
+ repo: ironic-image
+ name_postfix: '_ironic_from_source'
+ trigger_postfix: '-ironic-source'
+ ironic_install_type: 'source'
+ - ironic_ipa_downloader:
+ repo: ironic-ipa-downloader
+ - mariadb_image:
+ repo: mariadb-image
+ build_mariadb_image_locally: 'true'
+ ironic_use_mariadb: 'true'
+ image_os:
+ - ubuntu
+ - centos
+ capm3_target_branch:
+ - main:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: main
+ bmo_release_branch: main
+ target_branches:
+ - 'main'
+ - release-1-6:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.6
+ bmo_release_branch: release-0.5
+ target_branches:
+ - 'main'
+ - 'release-1.6'
+ - 'release-0.5'
+ - release-1-5:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.5
+ bmo_release_branch: release-0.4
+ target_branches:
+ - 'main'
+ - 'release-1.5'
+ - 'release-0.4'
+ - release-1-4:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.4
+ bmo_release_branch: release-0.3
+ target_branches:
+ - 'main'
+ - 'release-1.4'
+ - 'release-0.3'
+ jobs:
+ - dev_env_integration_tests
diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index 6767a97..da068a1 100644
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -148,6 +148,7 @@
- job-template:
name: 'onap-{project-name}-performance-tests-plots'
disabled_job_var: false
+ node: xerces-cps-hw
triggers:
- timed: '{timer}'
@@ -165,7 +166,7 @@
- job-template:
name: 'onap-{project-name}-{stream}-performance-test-java'
disabled_job_var: false
- node: onap-ubuntu1804
+ node: xerces-cps-hw
disabled: '{obj:disabled_job_var}'
concurrent: true
@@ -209,6 +210,7 @@
name: SUBDIRECTORY
default: '{subdirectory}'
description: Subdirectory of the workspace for which the pom.xml will be called. This allows the verify to be called against a specific directory
+
scm:
- git-scm:
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh