travis: reorder sections and add regenerated coverity token

Also remove the openssl section since both lxc and lxcfs don't need it
either.

Signed-off-by: Christian Brauner <christian@brauner.io>

diff --git a/.travis.yml b/.travis.yml
index baea487f7f990a5f9e62fd6f1ec9a1a0812559c2..ba73e7e2e879d3552f5b51264d99ddba1394ffca 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,30 +13,29 @@ arch:
  - ppc64le
  - s390x
 
-env:
-  global:
-   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-   #   via the "travis encrypt" command using the project repo's public key
-   - secure: "D3C+O5UjN8Oe0FROMk5yPRU0he4UNAaHdxwSVG2373ImzYIs3pIvre1kXzeQSajbXCRKiKE8p2U0TooIRZAo/JeaZDgb4dBhij4c4/Qv8MpFCTC1W7cgo6UeOQeZwdfqp7v9Zz5ubh6RW68bmSM2naqQim1zuD1vDSGy4Wir7z4="
-
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get -y install -qq automake autopoint xsltproc libselinux1-dev gettext
-  - echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
+script:
+ - ./autogen.sh --without-selinux --disable-man
+ - grep ENABLE_ config.status
+ - make
+
+env:
+  global:
+   - secure: "G47VYFrtzqalrVjixTqBG9Qsa8EZRcaqsh1k6fq5JgEyHmMQActpvTUDs9FXf1MEqiY5XX3VDVfBsZgKPHgmHsMzD1bX11xpnpGByB8g7gr8I3u2ZkCREqgi77a5l3LeBh+seWiambe/DYOgvPCNa6pCynLgR9advqtgKhpCruU="
 
 addons:
   coverity_scan:
+
     project:
       name: "shadow-maint/shadow"
       description: "Upstream shadow utils tree"
+
     notification_email: christian.brauner@ubuntu.com,serge@hallyn.com
+
     build_command_prepend: "./autogen.sh --without-selinux --disable-man"
     build_command: "make -j4"
     branch_pattern: master
 
-script:
- - ./autogen.sh --without-selinux --disable-man
- - grep ENABLE_ config.status
- - make
-
 # vim:et:ts=2:sw=2