[dpdk-stable] patch 'ci: fix Travis config warnings' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/29/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 166fc9016ebf61793ab32d608924508c49f6fcd3 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Wed, 19 Feb 2020 10:38:03 +0100
Subject: [PATCH] ci: fix Travis config warnings

[ upstream commit 9135705bb81df0b529821a121004c41f176995ff ]

Reading https://config.travis-ci.com/ and using
https://config.travis-ci.com/explore to check changes, we can cleanup
some warnings reported by the config validation options in Travis.

Example on a job in master:
https://travis-ci.com/DPDK/dpdk/builds/149537002/config

Build config validation:
root: deprecated key doc_packages (anchor on a non-private key)
root: deprecated key build_32b_packages (anchor on a non-private key)
root: deprecated key libabigail_build_packages (anchor on a non-private key)
root: deprecated key extra_packages (anchor on a non-private key)
root: deprecated key aarch64_packages (anchor on a non-private key)
root: key matrix is an alias for jobs, using jobs

For the "(anchor on a non-private key)" warnings, the Travis
documentation [1] recommends prefixing private keys with _ (Travis
schema is available at [2]).

The use of the "matrix" key is allowed, but it is just an alias to the
"jobs" key.

1: https://docs.travis-ci.com/user/build-config-yaml#private-keys-as-yaml-anchors-and-aliases-and-external-tooling
2: https://github.com/travis-ci/travis-yml/blob/730a77f4028b91293a55c8c1c52fc72e64379dde/schema.json

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Aaron Conole <aconole at redhat.com>
---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8f90d06f28..0bb47c191e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,19 +15,19 @@ addons:
     packages: &required_packages
       - [libnuma-dev, linux-headers-$(uname -r), python3-setuptools, python3-wheel, python3-pip, ninja-build]
 
-aarch64_packages: &aarch64_packages
+_aarch64_packages: &aarch64_packages
   - *required_packages
   - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross, pkg-config-aarch64-linux-gnu]
 
-extra_packages: &extra_packages
+_extra_packages: &extra_packages
   - *required_packages
   - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson4]
 
-build_32b_packages: &build_32b_packages
+_build_32b_packages: &build_32b_packages
   - *required_packages
   - [gcc-multilib]
 
-doc_packages: &doc_packages
+_doc_packages: &doc_packages
   - [doxygen, graphviz, python3-sphinx]
 
 before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
@@ -39,7 +39,7 @@ env:
   - DEF_LIB="shared" OPTS="-Denable_kmods=false"
   - DEF_LIB="shared" RUN_TESTS=1
 
-matrix:
+jobs:
   include:
   - env: DEF_LIB="static" BUILD_32BIT=1
     compiler: gcc
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-27 09:31:56.544106484 +0000
+++ 0022-ci-fix-Travis-config-warnings.patch	2020-02-27 09:31:55.743945932 +0000
@@ -1,8 +1,10 @@
-From 9135705bb81df0b529821a121004c41f176995ff Mon Sep 17 00:00:00 2001
+From 166fc9016ebf61793ab32d608924508c49f6fcd3 Mon Sep 17 00:00:00 2001
 From: David Marchand <david.marchand at redhat.com>
 Date: Wed, 19 Feb 2020 10:38:03 +0100
 Subject: [PATCH] ci: fix Travis config warnings
 
+[ upstream commit 9135705bb81df0b529821a121004c41f176995ff ]
+
 Reading https://config.travis-ci.com/ and using
 https://config.travis-ci.com/explore to check changes, we can cleanup
 some warnings reported by the config validation options in Travis.
@@ -31,16 +33,16 @@
 Signed-off-by: David Marchand <david.marchand at redhat.com>
 Acked-by: Aaron Conole <aconole at redhat.com>
 ---
- .travis.yml | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ .travis.yml | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/.travis.yml b/.travis.yml
-index 671447ee86..7c1b2ff1b4 100644
+index 8f90d06f28..0bb47c191e 100644
 --- a/.travis.yml
 +++ b/.travis.yml
-@@ -19,22 +19,22 @@ addons:
+@@ -15,19 +15,19 @@ addons:
      packages: &required_packages
-       - [libnuma-dev, python3-setuptools, python3-wheel, python3-pip, ninja-build]
+       - [libnuma-dev, linux-headers-$(uname -r), python3-setuptools, python3-wheel, python3-pip, ninja-build]
  
 -aarch64_packages: &aarch64_packages
 +_aarch64_packages: &aarch64_packages
@@ -50,11 +52,7 @@
 -extra_packages: &extra_packages
 +_extra_packages: &extra_packages
    - *required_packages
-   - [libbsd-dev, libpcap-dev, libibverbs-dev, libcrypto++-dev, libfdt-dev, libjansson4]
- 
--libabigail_build_packages: &libabigail_build_packages
-+_libabigail_build_packages: &libabigail_build_packages
-   - [autoconf, automake, libtool, pkg-config, libxml2-dev, libdw-dev]
+   - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson4]
  
 -build_32b_packages: &build_32b_packages
 +_build_32b_packages: &build_32b_packages
@@ -66,8 +64,8 @@
    - [doxygen, graphviz, python3-sphinx]
  
  before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
-@@ -44,7 +44,7 @@ env:
-   - DEF_LIB="shared"
+@@ -39,7 +39,7 @@ env:
+   - DEF_LIB="shared" OPTS="-Denable_kmods=false"
    - DEF_LIB="shared" RUN_TESTS=1
  
 -matrix: