CI: remove travis details

Rename still used leftovers to "zuul" as that's now the CI using them.

Closes #7313

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644 (file)
index c1c745b..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-#***************************************************************************
-#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___
-#                             \___|\___/|_| \_\_____|
-#
-# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at https://curl.se/docs/copyright.html.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-###########################################################################
-language: c
-os: linux
-dist: bionic
-cache:
-  directories:
-  - $HOME/wolfssl-4.7.0-stable
-  - $HOME/mesalink-1.0.0
-  - $HOME/bearssl-0.6
-
-env:
-  global:
-  - LD_LIBRARY_PATH=/usr/local/lib
-
-addons:
-  apt: &common_apt
-    config:
-      retries: true
-    packages: &common_packages
-    - cmake
-    - valgrind
-    - libev-dev
-    - libc-ares-dev
-    - g++-8
-    - stunnel4
-    - libidn2-dev
-    - gnutls-bin
-    - python-impacket
-    - ninja-build
-    - libgsasl7-dev
-    - libnghttp2-dev
-
-jobs:
-  include:
-  - env:
-    - T=debug C="--with-openssl" TFLAGS=-n
-    - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
-    arch: ppc64le
-    addons:
-      apt:
-        <<: *common_apt
-        packages:
-        - *common_packages
-        - libpsl-dev
-        - libbrotli-dev
-        - libzstd-dev
-        - libev-dev
-        - libssl-dev
-        - libtool
-        - pkg-config
-        - zlib1g-dev
-
-  - env:
-    - T=debug C="--with-openssl" TFLAGS=-n
-    - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
-    arch: s390x
-    addons:
-      apt:
-        <<: *common_apt
-        packages:
-        - *common_packages
-        - libpsl-dev
-        - libbrotli-dev
-        - libzstd-dev
-        - libev-dev
-        - libssl-dev
-        - libtool
-        - pkg-config
-        - zlib1g-dev
-
-before_install:
-- export "${OVERRIDE_CC-blank=}"
-- export "${OVERRIDE_CXX-blank=}"
-
-install:
-- if [ "$T" = "coverage" ]; then pip2 install --user cpp-coveralls; fi
-
-# before_script and script:
-# Travis isn't reliable catching errors in inline script commands (#3730).
-# Do not add anything here, instead add to the respective script.
-before_script:
-- ./scripts/travis/before_script.sh || travis_terminate 1
-script:
-- ./scripts/travis/script.sh || travis_terminate 1
-
-# select branches to avoid testing feature branches twice (as branch and as pull request)
-branches:
-  only:
-  - master
-  - /\/ci$/
-
-notifications:
-  email: false
\ No newline at end of file

diff --git a/README.md b/README.md
index 416cc34de95ab7863a000607fd1647f90c054a72..0ba5b781eb3e974ba9ebee9532805d5ddfd9b9ae 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/63/badge)](https://bestpractices.coreinfrastructure.org/projects/63)
 [![Coverity passed](https://scan.coverity.com/projects/curl/badge.svg)](https://scan.coverity.com/projects/curl)
-[![Travis-CI Build Status](https://travis-ci.org/curl/curl.svg?branch=master)](https://travis-ci.org/curl/curl)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/l1vv31029huhf4g4?svg=true)](https://ci.appveyor.com/project/curlorg/curl)
 [![Azure DevOps Build Status](https://dev.azure.com/daniel0244/curl/_apis/build/status/curl.curl?branchName=master)](https://dev.azure.com/daniel0244/curl/_build/latest?definitionId=1&branchName=master)
 [![Cirrus Build Status](https://api.cirrus-ci.com/github/curl/curl.svg?branch=master)](https://cirrus-ci.com/github/curl/curl)

diff --git a/docs/CONTRIBUTE.md b/docs/CONTRIBUTE.md
index f2269a20490c6c62586225b51642fd3b11f7c239..3571b7aeaa202c59923dac0f37ab49e44aff4e23 100644 (file)
--- a/docs/CONTRIBUTE.md
+++ b/docs/CONTRIBUTE.md
@@ -185,7 +185,6 @@ Consider the following table while looking at pull request failures:
  | LGTM analysis:  C/C++               | stable | new findings               |
  | buildbot/curl_winssl_ ...           | stable | all errors and failures    |
  | continuous-integration/appveyor/pr  | stable | all errors and failures    |
- | continuous-integration/travis-ci/pr | stable | all errors and failures    |
  | curl.curl (linux ...)               | stable | all errors and failures    |
  | curl.curl (windows ...)             | flaky  | repetitive errors/failures |
  | deepcode-ci-bot                     | stable | new findings               |

diff --git a/scripts/travis/before_script.sh b/scripts/zuul/before_script.sh
similarity index 96%
rename from scripts/travis/before_script.sh
rename to scripts/zuul/before_script.sh
index b7a321bcb82df63dafd70590af5cc3733b00d939..e5d9061a99ee577ec179dd63274adac01872dffc 100755 (executable)
--- a/scripts/travis/before_script.sh
+++ b/scripts/zuul/before_script.sh
@@ -145,9 +145,6 @@ if [ $TRAVIS_OS_NAME = linux -a "$WOLFSSL" ]; then
 fi
 
 # Install common libraries.
-# The library build directories are set to be cached by .travis.yml. If you are
-# changing a build directory name below (eg a version change) then you must
-# change it in .travis.yml `cache: directories:` as well.
 if [ $TRAVIS_OS_NAME = linux ]; then
 
   if [ "$MESALINK" = "yes" ]; then

diff --git a/scripts/travis/iconv-env.sh b/scripts/zuul/iconv-env.sh
similarity index 100%
rename from scripts/travis/iconv-env.sh
rename to scripts/zuul/iconv-env.sh

diff --git a/scripts/travis/script.sh b/scripts/zuul/script.sh
similarity index 99%
rename from scripts/travis/script.sh
rename to scripts/zuul/script.sh
index f2286850d14e26001acb4c6caa9cffc63054cd45..55286bdb721c4bb567c929260263203a7a3b22c7 100755 (executable)
--- a/scripts/travis/script.sh
+++ b/scripts/zuul/script.sh
@@ -113,7 +113,7 @@ if [ "$T" = "tidy" ]; then
 fi
 
 if [ "$T" = "iconv" ]; then
-  source scripts/travis/iconv-env.sh
+  source scripts/zuul/iconv-env.sh
   ./configure --enable-debug --enable-werror $C
   make
   make examples

diff --git a/zuul.d/playbooks/pre.yaml b/zuul.d/playbooks/pre.yaml
index 10334736f57b5bedecdc8eb0cfeab2bec3f6d9bd..bb4d3ded7f2cf466f6f1a26baac12a4ff65e7d91 100644 (file)
--- a/zuul.d/playbooks/pre.yaml
+++ b/zuul.d/playbooks/pre.yaml
@@ -63,7 +63,7 @@
       state: link
 
   - name: Run before script
-    shell: "./scripts/travis/before_script.sh"
+    shell: "./scripts/zuul/before_script.sh"
     args:
       chdir: "{{ zuul.project.src_dir }}"
     environment: "{{ curl_env }}"

diff --git a/zuul.d/playbooks/run.yaml b/zuul.d/playbooks/run.yaml
index 862fbaa51da0728c1eb290e7517bc989c0a4973e..4904b9c9e718b7cbc4b6c467a1d99d463d814895 100644 (file)
--- a/zuul.d/playbooks/run.yaml
+++ b/zuul.d/playbooks/run.yaml
@@ -7,6 +7,6 @@
 
   - name: Run tests
     environment: "{{ curl_env }}"
-    shell: "./scripts/travis/script.sh"
+    shell: "./scripts/zuul/script.sh"
     args:
       chdir: "{{ zuul.project.src_dir }}"
\ No newline at end of file