From 221efe6a33aa75e8359f46fdb016500bbcbd3fa4 Mon Sep 17 00:00:00 2001
From: Dave Wallace <dwallacelf@gmail.com>
Date: Tue, 6 Apr 2021 17:08:21 -0400
Subject: Use fdio-infra-publish for nomad executor based jobs

- Separate post build executor info dump into its
  own script file.
- Remove backup_upload_archives.sh from
  fdio-infra-shiplogs which is now only used for
  openstack executors.
- Add setup_executor_env.sh to run first for all
  jobs which run on nomad/dockerhub images.

Change-Id: I564201b8c578e6541152e6af74537d1d007ba1a7
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
---
 jjb/csit/csit-perf.yaml       | 30 ++++++++++--------------------
 jjb/csit/csit-tox.yaml        |  3 +--
 jjb/csit/csit-vpp-device.yaml |  9 +++------
 jjb/csit/csit.yaml            | 12 ++++--------
 4 files changed, 18 insertions(+), 36 deletions(-)

(limited to 'jjb/csit')

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 1c44e8940..d8e8418f1 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -442,8 +442,7 @@
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-perf-mrr-daily-master{node-arch}'
@@ -520,8 +519,7 @@
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}'
@@ -598,8 +596,7 @@
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}'
@@ -671,8 +668,7 @@
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-dpdk-perf-verify-{stream}-{node-arch}'
@@ -772,8 +768,7 @@
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-dpdk-perf-mrr-weekly-master{node-arch}'
@@ -850,8 +845,7 @@
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-perf-report-iterative-{stream_report}-{node-arch}'
@@ -952,8 +946,7 @@
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-dpdk-perf-report-iterative-{stream_report}-{node-arch}'
@@ -1054,8 +1047,7 @@
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-perf-report-coverage-{stream_report}-{node-arch}'
@@ -1156,8 +1148,7 @@
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-dpdk-perf-report-coverage-{stream_report}-{node-arch}'
@@ -1258,5 +1249,4 @@
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index f5f7b2b1f..cd1b85592 100644
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -120,5 +120,4 @@
             max: 250
             unstable: 250
             pattern: 'pylint.log'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index fae559dc4..99c16598a 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -130,8 +130,7 @@
           output-path: 'archives'
           other-files:
             - '*.*'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}-semiweekly'
@@ -188,8 +187,7 @@
           output-path: 'archives'
           other-files:
             - '*.*'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}-weekly'
@@ -248,5 +246,4 @@
           output-path: 'archives'
           other-files:
             - '*.*'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 75da7df52..ea2d55045 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -125,8 +125,7 @@
           - ../scripts/csit/docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-report-merge-{stream}-{os}-{executor-arch}'
@@ -204,8 +203,7 @@
           - ../scripts/csit/report.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-trending-daily-master-{os}-{executor-arch}'
@@ -305,8 +303,7 @@
           always: true
           failure: false
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-trending-weekly-2009-lts-{os}-{executor-arch}'
@@ -406,8 +403,7 @@
           always: true
           failure: false
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - project:
     name: csit-info
-- 
cgit 1.2.3-korg