From: Cedric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 30 Sep 2023 15:58:50 +0000 (+0000)
Subject: Merge "Add logics to cover podman deployments"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a21cb3db6aeb8a34d83bfe3ceaa71f8ff84f15db;hp=36b7f40bd9fe8f48d8c6ac75b813fb8a59919ef1;p=releng.git

Merge "Add logics to cover podman deployments"
---

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 e9b31e745..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
+          jenkins-jobs update --recursive --delete-old jjb
 
 - parameter:
     name: releng-jjb-node
diff --git a/releases/orinoco/opnfvdocs.yaml b/releases/orinoco/opnfvdocs.yaml
index 396c942ef..e05c3492b 100644
--- a/releases/orinoco/opnfvdocs.yaml
+++ b/releases/orinoco/opnfvdocs.yaml
@@ -1,11 +1,3 @@
-# SPDX-License-Identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2023 The Linux Foundation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
 ---
 project: opnfvdocs
 project-type: infra