Merge "disable openstack image builds"
diff --git a/jjb/infra/update-jenkins-slave.sh b/jjb/infra/update-jenkins-slave.sh
index 1b1a7c9..1fe6202 100644
--- a/jjb/infra/update-jenkins-slave.sh
+++ b/jjb/infra/update-jenkins-slave.sh
@@ -17,7 +17,7 @@
try=$((try + 1))
done
-sudo apt install -y -q=3 python3-minimal python3-pip virtualenv
+sudo apt install -y -q=3 python3.8-minimal python3-pip virtualenv
# workaround for https://github.com/pypa/virtualenv/issues/1029
export PS1=${PS1:-}
@@ -25,7 +25,7 @@
cd "$WORKSPACE"
echo "----------------------------------------------------"
echo "Info: Create virtualenv to update Jenkins slaves"
-virtualenv -p python3 --quiet --no-site-packages .venv
+virtualenv -p python3.8 --quiet --no-site-packages .venv
source .venv/bin/activate
pip install python-openstackclient
echo "----------------------------------------------------"
diff --git a/jjb/metal3/defaults.yml b/jjb/metal3/defaults.yml
index a423fa3..9a35553 100644
--- a/jjb/metal3/defaults.yml
+++ b/jjb/metal3/defaults.yml
@@ -35,7 +35,11 @@
ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline'
e2e_feature_test_parallel_pipeline: 'jenkins/jobs/parallel_e2e_features_test.pipeline'
ci_github_jenkins_credentials_id: 'metal3-jenkins-github-username-token'
- ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
+ # 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
+ # of global configuration and not to GitHub Server configuration
+ ci_ghprb_auth_id: '46a64807-1e1c-409d-a87d-0b9837a699ab'
- defaults:
name: integration-default-values
<<: *global_defaults
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 760ab4f..ed1ad10 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -45,7 +45,7 @@
org: "Nordix"
name: "metal3-dev-tools"
ci_github_jenkins_credentials_id: 'nordix-metal3-ci-github-prod-token'
- ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
+ ci_ghprb_auth_id: '86c49704-5474-4524-97b7-805323b2c39a'
ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
- project:
@@ -101,10 +101,11 @@
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: release-1.4
- bmo_release_branch: v0.3.0 # This would point to a tag until we branch out
+ bmo_release_branch: release-0.3
target_branches:
- 'main'
- 'release-1.4'
+ - 'release-0.3'
- release-1-3:
capi_version: v1beta1
capm3_version: v1beta1
@@ -158,10 +159,11 @@
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: release-1.4
- bmo_release_branch: v0.3.0 # This would point to a tag until we branch out
+ bmo_release_branch: release-0.3
target_branches:
- 'main'
- 'release-1.4'
+ - 'release-0.3'
- release-1-3:
capi_version: v1beta1
capm3_version: v1beta1
@@ -199,7 +201,7 @@
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: release-1.4
- bmo_release_branch: v0.3.0
+ bmo_release_branch: release-0.3
schedule: "30 4 * * *"
- release-1-3:
capi_version: v1beta1
@@ -309,10 +311,11 @@
kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
k8s_version_upgrade_to: v1.27.4
capm3_release_branch: release-1.4
- bmo_release_branch: v0.3.0
+ bmo_release_branch: release-0.3
capm3_target_branch: release-1-4
target_branches:
- 'release-1.4'
+ - 'release-0.3'
- 1-25-1-26:
k8s_version_upgrade_from: v1.25.5
kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29 # v1.25.5
@@ -346,10 +349,11 @@
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: release-1.4
- bmo_release_branch: v0.3.0
+ bmo_release_branch: release-0.3
target_branches:
- 'main'
- 'release-1.4'
+ - 'release-0.3'
- capm3_e2e_basic_tests:
capm3_target_branch:
- main:
@@ -389,9 +393,10 @@
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: release-1.4
- bmo_release_branch: v0.3.0
+ bmo_release_branch: release-0.3
target_branches:
- 'release-1.4'
+ - 'release-0.3'
- release-1-3:
capi_version: v1beta1
capm3_version: v1beta1
@@ -456,9 +461,10 @@
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: release-1.4
- bmo_release_branch: v0.3.0
+ bmo_release_branch: release-0.3
target_branches:
- 'release-1.4'
+ - 'release-0.3'
- release-1-3:
capi_version: v1beta1
capm3_version: v1beta1
@@ -522,10 +528,11 @@
kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
k8s_version_upgrade_to: v1.27.4
capm3_release_branch: release-1.4
- bmo_release_branch: v0.3.0
+ bmo_release_branch: release-0.3
capm3_target_branch: release-1-4
target_branches:
- 'release-1.4'
+ - 'release-0.3'
- 1-25-1-26:
k8s_version_upgrade_from: v1.25.5
kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29 # v1.25.5
@@ -596,7 +603,7 @@
kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
k8s_version_upgrade_to: v1.27.4
capm3_release_branch: release-1.4
- bmo_release_branch: v0.3.0
+ bmo_release_branch: release-0.3
capm3_target_branch: release-1-4
- 1-25-1-26:
k8s_version_upgrade_from: v1.25.5
@@ -645,7 +652,7 @@
capm3_version: v1beta1
capm3_branch: release-1.4
capm3_release_branch: release-1.4
- bmo_release_branch: v0.3.0
+ bmo_release_branch: release-0.3
schedule: "H 5 * * *"
- release-1-3:
capi_version: v1beta1
@@ -705,5 +712,5 @@
jobs:
- container_image_building
ci_github_jenkins_credentials_id: 'nordix-metal3-ci-github-prod-token'
- ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
+ ci_ghprb_auth_id: '86c49704-5474-4524-97b7-805323b2c39a'
ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
diff --git a/jjb/onap/cps-cps-tbdmt/cps-cps-tbdmt-push-upstream-jobs.yml b/jjb/onap/cps-cps-tbdmt/cps-cps-tbdmt-push-upstream-jobs.yml
new file mode 100644
index 0000000..96ace18
--- /dev/null
+++ b/jjb/onap/cps-cps-tbdmt/cps-cps-tbdmt-push-upstream-jobs.yml
@@ -0,0 +1,26 @@
+---
+# ============LICENSE_START=======================================================
+# Copyright (C) 2023 OpenInfra 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=========================================================
+#
+- project:
+ name: cps-cps-tbdmt-push-upstream
+ project: cps/cps-tbdmt
+ project-name: cps-cps-tbdmt
+
+ jobs:
+ - 'onap-{project-name}-push-upstream'
\ No newline at end of file
diff --git a/jjb/onap/cps-cps-tbdmt/cps-cps-tbdmt-rebase-jobs.yml b/jjb/onap/cps-cps-tbdmt/cps-cps-tbdmt-rebase-jobs.yml
new file mode 100644
index 0000000..605da70
--- /dev/null
+++ b/jjb/onap/cps-cps-tbdmt/cps-cps-tbdmt-rebase-jobs.yml
@@ -0,0 +1,26 @@
+---
+# ============LICENSE_START=======================================================
+# Copyright (C) 2023 OpenInfra 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=========================================================
+#
+- project:
+ name: cps-cps-tbdmt-rebase
+ project: cps/cps-tbdmt
+ project-name: cps-cps-tbdmt
+
+ jobs:
+ - 'onap-{project-name}-rebase'
\ No newline at end of file
diff --git a/jjb/onap/cps-cps-tbdmt/cps-cps-tbdmt-verify-jobs.yaml b/jjb/onap/cps-cps-tbdmt/cps-cps-tbdmt-verify-jobs.yaml
new file mode 100644
index 0000000..a018740
--- /dev/null
+++ b/jjb/onap/cps-cps-tbdmt/cps-cps-tbdmt-verify-jobs.yaml
@@ -0,0 +1,33 @@
+---
+# ============LICENSE_START=======================================================
+# Copyright (C) 2023 OpenInfra 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=========================================================
+#
+# this job gets triggered when a change is proposed to
+# cps/cps-tbdmt project on Nordix Gerrit.
+- project:
+ name: cps-cps-tbdmt-verify
+ project: cps/cps-tbdmt
+ project-name: cps-cps-tbdmt
+
+ stream:
+ - master:
+ branch: '{stream}'
+ jdk-version: java-11
+
+ jobs:
+ - 'onap-{project-name}-{stream}-verify-java'