From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
	by inbox.dpdk.org (Postfix) with ESMTP id F0231A0555;
	Wed, 19 Feb 2020 20:42:03 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id 73CD91BF9A;
	Wed, 19 Feb 2020 20:41:55 +0100 (CET)
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com
 [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id E4FEF1B13C
 for <dev@dpdk.org>; Wed, 19 Feb 2020 20:41:53 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
 s=mimecast20190719; t=1582141313;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=fhkFvOrZUaPYHjmx4K00GTlXrxg0TWHalqzLNTR6U3s=;
 b=XuRoObIDZU53oQJFJchsjP6QAlbRet2WCXTRb9Q2LeZkKcmeCtCjTZfGK6u5mYC/dD4Xn5
 U+F0/8PE+fJ5vUhxBpELw11uCTThi2xM0nsi7ycWYl/3Fz8zGrrI/K9bwWeVxWuLK6Nvns
 x9KnMtMLRQja7xSejaF/FjrD9L0AiRw=
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-377-1X5IMWVxPjWTtO3zQ6LvWQ-1; Wed, 19 Feb 2020 14:41:50 -0500
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1651D1005510;
 Wed, 19 Feb 2020 19:41:49 +0000 (UTC)
Received: from dmarchan.remote.csb (ovpn-204-34.brq.redhat.com [10.40.204.34])
 by smtp.corp.redhat.com (Postfix) with ESMTP id C82281001B09;
 Wed, 19 Feb 2020 19:41:47 +0000 (UTC)
From: David Marchand <david.marchand@redhat.com>
To: thomas@monjalon.net,
	aconole@redhat.com
Cc: dev@dpdk.org,
	Michael Santana <maicolgabriel@hotmail.com>
Date: Wed, 19 Feb 2020 20:41:30 +0100
Message-Id: <20200219194131.29417-4-david.marchand@redhat.com>
In-Reply-To: <20200219194131.29417-1-david.marchand@redhat.com>
References: <20200219194131.29417-1-david.marchand@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-MC-Unique: 1X5IMWVxPjWTtO3zQ6LvWQ-1
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Subject: [dpdk-dev] [PATCH 3/4] ci: use an explicit list of Travis jobs
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

Maintaining the .travis.yml requires some knowledge of how Travis
computes the jobs list (combination of os: arch: compiler: etc...).
Let's switch to an explicit list to find all jobs at a glance.

To enhance readability, jobs have been sorted per arch/compiler with
comments to isolate blocks.

Setting required_packages for aarch64 native jobs is unnecessary,
the global addons: values are the same.

This commit does not change the jobs list (21 jobs in total).

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 .travis.yml | 102 ++++++++++++++++++++++++++--------------------------
 1 file changed, 52 insertions(+), 50 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7c1b2ff1b..c174d5f30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,14 @@
+# default values for all jobs
 language: c
 cache:
   ccache: true
   directories:
     - libabigail
     - reference
-compiler:
-  - gcc
-  - clang
=20
 dist: bionic
=20
-os:
-  - linux
+os: linux
=20
 addons:
   apt:
@@ -38,98 +35,105 @@ _doc_packages: &doc_packages
   - [doxygen, graphviz, python3-sphinx]
=20
 before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
-
-env:
-  - DEF_LIB=3D"static"
-  - DEF_LIB=3D"shared"
-  - DEF_LIB=3D"shared" RUN_TESTS=3D1
+script: ./.ci/${TRAVIS_OS_NAME}-build.sh
=20
 jobs:
   include:
-  - env: DEF_LIB=3D"static" BUILD_32BIT=3D1
+  # x86_64 gcc jobs
+  - env: DEF_LIB=3D"static"
+    arch: amd64
     compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *build_32b_packages
-  - env: DEF_LIB=3D"static" AARCH64=3D1
+  - env: DEF_LIB=3D"shared"
+    arch: amd64
     compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *aarch64_packages
-  - env: DEF_LIB=3D"shared" AARCH64=3D1
+  - env: DEF_LIB=3D"shared" RUN_TESTS=3D1
+    arch: amd64
     compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *aarch64_packages
   - env: DEF_LIB=3D"static" EXTRA_PACKAGES=3D1
+    arch: amd64
     compiler: gcc
     addons:
       apt:
         packages:
           - *extra_packages
   - env: DEF_LIB=3D"shared" EXTRA_PACKAGES=3D1 RUN_TESTS=3D1 BUILD_DOCS=3D=
1
+    arch: amd64
     compiler: gcc
     addons:
       apt:
         packages:
           - *extra_packages
           - *doc_packages
-  - env: DEF_LIB=3D"static" EXTRA_PACKAGES=3D1
+  - env: DEF_LIB=3D"shared" EXTRA_PACKAGES=3D1 ABI_CHECKS=3D1
+    arch: amd64
     compiler: gcc
     addons:
       apt:
         packages:
           - *extra_packages
+          - *libabigail_build_packages
+  # x86_64 clang jobs
+  - env: DEF_LIB=3D"static"
+    arch: amd64
+    compiler: clang
+  - env: DEF_LIB=3D"shared"
+    arch: amd64
+    compiler: clang
+  - env: DEF_LIB=3D"shared" RUN_TESTS=3D1
+    arch: amd64
+    compiler: clang
   - env: DEF_LIB=3D"static" EXTRA_PACKAGES=3D1
+    arch: amd64
     compiler: clang
     addons:
       apt:
         packages:
           - *extra_packages
   - env: DEF_LIB=3D"shared" EXTRA_PACKAGES=3D1
+    arch: amd64
     compiler: clang
     addons:
       apt:
         packages:
           - *extra_packages
   - env: DEF_LIB=3D"shared" EXTRA_PACKAGES=3D1 RUN_TESTS=3D1 BUILD_DOCS=3D=
1
+    arch: amd64
     compiler: clang
     addons:
       apt:
         packages:
           - *extra_packages
           - *doc_packages
-  - env: DEF_LIB=3D"static"
-    arch: arm64
+  # x86_64 cross-compiling 32-bits jobs
+  - env: DEF_LIB=3D"static" BUILD_32BIT=3D1
+    arch: amd64
     compiler: gcc
     addons:
       apt:
         packages:
-          - *required_packages
-  - env: DEF_LIB=3D"shared"
-    arch: arm64
+          - *build_32b_packages
+  # x86_64 cross-compiling aarch64 jobs
+  - env: DEF_LIB=3D"static" AARCH64=3D1
+    arch: amd64
     compiler: gcc
     addons:
       apt:
         packages:
-          - *required_packages
-  - env: DEF_LIB=3D"static"
-    arch: arm64
-    compiler: clang
+          - *aarch64_packages
+  - env: DEF_LIB=3D"shared" AARCH64=3D1
+    arch: amd64
+    compiler: gcc
     addons:
       apt:
         packages:
-          - *required_packages
+          - *aarch64_packages
+  # aarch64 gcc jobs
+  - env: DEF_LIB=3D"static"
+    arch: arm64
+    compiler: gcc
   - env: DEF_LIB=3D"shared"
     arch: arm64
-    compiler: clang
-    addons:
-      apt:
-        packages:
-          - *required_packages
+    compiler: gcc
   - env: DEF_LIB=3D"shared" BUILD_DOCS=3D1
     arch: arm64
     compiler: gcc
@@ -138,13 +142,6 @@ jobs:
         packages:
           - *required_packages
           - *doc_packages
-  - env: DEF_LIB=3D"shared" EXTRA_PACKAGES=3D1 ABI_CHECKS=3D1
-    compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *extra_packages
-          - *libabigail_build_packages
   - env: DEF_LIB=3D"shared" EXTRA_PACKAGES=3D1 ABI_CHECKS=3D1
     arch: arm64
     compiler: gcc
@@ -153,5 +150,10 @@ jobs:
         packages:
           - *extra_packages
           - *libabigail_build_packages
-
-script: ./.ci/${TRAVIS_OS_NAME}-build.sh
+  # aarch64 clang jobs
+  - env: DEF_LIB=3D"static"
+    arch: arm64
+    compiler: clang
+  - env: DEF_LIB=3D"shared"
+    arch: arm64
+    compiler: clang
--=20
2.23.0