Merge "Bump lfit/releng-reusable-workflows/.github/workflows/gerrit-ci-management-merge.yaml"
diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml
index 7d034fb..1d196ff 100644
--- a/.github/workflows/gerrit-verify.yaml
+++ b/.github/workflows/gerrit-verify.yaml
@@ -52,7 +52,7 @@
jobs:
call-composed-ci-man-verify:
# yamllint disable-line rule:line-length
- uses: lfit/releng-reusable-workflows/.github/workflows/gerrit-ci-management-verify.yaml@f8814d81051c7a2e4d7584657b4d283b62a56b20
+ uses: lfit/releng-reusable-workflows/.github/workflows/gerrit-ci-management-verify.yaml@b4c8bfdea114d034bfa6ed2fe2c9775bc091d5ca
with:
GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }}
GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }}
diff --git a/jjb/github-release/voltha.yaml b/jjb/github-release/voltha.yaml
index a3ec8be..ddaa32f 100644
--- a/jjb/github-release/voltha.yaml
+++ b/jjb/github-release/voltha.yaml
@@ -47,7 +47,7 @@
jenkins-ssh-credential: '{gerrit-ssh-credential}'
- credentials-binding:
- text:
- credential-id: onf-voltha
+ credential-id: github-release-2025
variable: GITHUB_TOKEN
scm:
diff --git a/jjb/pipeline/voltha/bbsim-tests.groovy b/jjb/pipeline/voltha/bbsim-tests.groovy
index d8b50b9..2ccc319 100644
--- a/jjb/pipeline/voltha/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/bbsim-tests.groovy
@@ -37,7 +37,7 @@
// as a guarantee release jobs are running in an expected sandbox.
// -----------------------------------------------------------------------
String branchName() {
- def validBranches = ["master", "voltha-2.14"]
+ def validBranches = ["master", "voltha-2.15"]
// "${branch}" is assigned by jenkins
if (!validBranches.contains(branch)) {
diff --git a/jjb/shell/pypi-publish.sh b/jjb/shell/pypi-publish.sh
index 3118df7..8b3f486 100755
--- a/jjb/shell/pypi-publish.sh
+++ b/jjb/shell/pypi-publish.sh
@@ -56,6 +56,13 @@
pushd "$pymoddir"
echo "Building python module in '$pymoddir'"
+ # Activate venv (created by Makefile) and get latest packages
+ if [[ -f .venv/bin/activate ]]; then
+ source .venv/bin/activate
+ fi
+ pip install --upgrade pip
+ pip install --upgrade setuptools pkginfo wheel twine
+ python3 setup.py sdist
# Create source distribution
python setup.py sdist
diff --git a/jjb/verify/voltha-protos.yaml b/jjb/verify/voltha-protos.yaml
index 91d0e31..47bfd79 100644
--- a/jjb/verify/voltha-protos.yaml
+++ b/jjb/verify/voltha-protos.yaml
@@ -30,5 +30,6 @@
- 'pypi-publish':
project-regexp: '^{name}$'
dependency-jobs: 'version-tag_wildcard'
+ build-node: ubuntu22.04-basebuild-4c-8g
# [EOF]
diff --git a/jjb/voltha-e2e/master.yaml b/jjb/voltha-e2e/master.yaml
index be24b24..89ae1a0 100644
--- a/jjb/voltha-e2e/master.yaml
+++ b/jjb/voltha-e2e/master.yaml
@@ -84,21 +84,25 @@
flags: ""
teardown: true
logging: true
+ vgcEnabled: true
- target: functional-single-kind-dt-vgc
workflow: dt
flags: ""
teardown: true
logging: true
+ vgcEnabled: true
- target: sanity-kind-dt-fttb-vgc
workflow: dt
flags: ""
teardown: true
logging: true
+ vgcEnabled: true
- target: bbsim-failurescenarios-dt-vgc
workflow: dt
flags: ""
teardown: true
logging: true
+ vgcEnabled: true
timeout: 140
- 'voltha-periodic-test':
name: 'periodic-voltha-combined-vgc-multi-olt'
@@ -113,11 +117,13 @@
flags: "--set onu=2,pon=2"
teardown: true
logging: true
+ vgcEnabled: true
- target: bbsim-multiolt-kind-dt-vgc
workflow: dt
- flags: ""
+ flags: "--set onu=2,pon=2"
teardown: true
logging: true
+ vgcEnabled: true
timeout: 140
# -----------------------------------------------------------------------
diff --git a/requirements.txt b/requirements.txt
index 957764d..e4e07fd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
## -----------------------------------------------------------------------
## -----------------------------------------------------------------------
-jenkins-job-builder==4.1.0
+jenkins-job-builder==6.4.1
pipdeptree
jenkins-jobs
diff --git a/vars/volthaDeploy.groovy b/vars/volthaDeploy.groovy
index 01a51d7..2735b7a 100644
--- a/vars/volthaDeploy.groovy
+++ b/vars/volthaDeploy.groovy
@@ -117,8 +117,7 @@
sh(label : 'Configure helm repo',
script : """
-helm repo add onf https://charts.lfbroadband.org
-helm repo update
+helm repo add onf https://charts.lfbroadband.org || helm repo update
""")
// ---------------------