From 1ec776e0003434909ff34c50562c378b01afa9fc Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 30 Sep 2023 17:39:52 +0200
Subject: Stop filtering jjbs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
A few jobs won't be executed becasue of missing runners (Functest)
Change-Id: I4cff35efc548855e9c735ec770bf391e3cfe1957
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
jjb/functest/xtesting.yaml | 14 +++++++-------
jjb/global/slave-params.yaml | 3 ++-
jjb/releng/releng-jobs.yaml | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index cecd04707..920efde79 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -15,37 +15,37 @@
from:
build_args:
branch: master
- node: xtesting
+ node: opnfv-build
dependency: 3.17
- 2023.1:
from:
build_args:
branch: stable/2023.1
- node: xtesting
+ node: opnfv-build
dependency: 3.17
- zed:
from:
build_args:
branch: stable/zed
- node: xtesting
+ node: opnfv-build
dependency: 3.16
- yoga:
from:
build_args:
branch: stable/yoga
- node: xtesting
+ node: opnfv-build
dependency: 3.16
- xena:
from:
build_args:
branch: stable/xena
- node: xtesting
+ node: opnfv-build
dependency: 3.14
- wallaby:
from:
build_args:
branch: stable/wallaby
- node: xtesting
+ node: opnfv-build
dependency: 3.13
- xtesting-jobs: &xtesting-jobs
@@ -502,7 +502,7 @@
python3.9 python3.9-dev python3.9-distutils \
python3.8 python3.8-dev python3.8-distutils \
python3-pip enchant-2 -y
- sudo pip3 install tox tox-pip-version
+ sudo pip3 install tox
tox
diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index 50743b70b..7d0996bb6 100644
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -1,3 +1,4 @@
+---
- parameter:
name: 'opnfv-build-defaults'
parameters:
@@ -21,7 +22,7 @@
parameters:
- label:
name: SLAVE_LABEL
- default: 'opnfv-build-ubuntu'
+ default: 'anuket-build'
description: 'Slave label on Jenkins'
all-nodes: false
node-eligibility: 'ignore-offline'
diff --git a/jjb/releng/releng-jobs.yaml b/jjb/releng/releng-jobs.yaml
index f32a07869..23f5d91e1 100644
--- a/jjb/releng/releng-jobs.yaml
+++ b/jjb/releng/releng-jobs.yaml
@@ -63,7 +63,7 @@
-o DPkg::Lock::Timeout=300 dist-upgrade -y
sudo DEBIAN_FRONTEND=noninteractive \
apt-get -o DPkg::Lock::Timeout=300 install jenkins-job-builder -y
- jenkins-jobs update --recursive --delete-old jjb/releng:jjb/global
+ jenkins-jobs update --recursive --delete-old jjb
- parameter:
name: releng-jjb-node
--
cgit