From 4146292fd7b0e50d6d91e1cb79f0e87378cb0937 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 24 Aug 2023 13:07:47 -0500 Subject: [PATCH] Removed references to travis Ticket: ENT-10447 Changelog: none (cherry picked from commit 16410e0fd9763078b74c2f46f77e4521794ac283) --- .github/workflows/valgrind.sh | 2 +- .travis.yml | 59 --------------------- travis-scripts/after_script.sh | 24 --------- travis-scripts/after_success.sh | 1 - travis-scripts/before_install.sh | 41 --------------- travis-scripts/script.sh | 88 -------------------------------- 6 files changed, 1 insertion(+), 214 deletions(-) delete mode 100644 .travis.yml delete mode 100755 travis-scripts/after_script.sh delete mode 100755 travis-scripts/after_success.sh delete mode 100755 travis-scripts/before_install.sh delete mode 100755 travis-scripts/script.sh diff --git a/.github/workflows/valgrind.sh b/.github/workflows/valgrind.sh index f510166130..73e7a48dd0 100644 --- a/.github/workflows/valgrind.sh +++ b/.github/workflows/valgrind.sh @@ -49,7 +49,7 @@ function check_serverd_valgrind_output { exit 1 fi set -e - echo "Serverd has 1 expected valgrind error in travis because of old glibc" + echo "Serverd has 1 expected valgrind error because of old glibc" echo "Because of this we use special assertions on output" echo "Looking for problems in $1:" grep -i "definitely lost" $1 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4dcfc5ef5e..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,59 +0,0 @@ -language: c -os: linux -dist: xenial - -# This is an addon for uploading artifacts to s3: -# https://docs.travis-ci.com/user/uploading-artifacts/ -# Env vars: ARTIFACTS_BUCKET ARTIFACTS_SECRET ARTIFACTS_BUCKET -# If you are logged in and have permission, you can see here: -# https://s3.console.aws.amazon.com/s3/buckets/cfengine-travis-artifacts?region=us-east-1 -addons: - artifacts: - paths: - - artifacts/ - -# Build on pushes only to given branches -branches: - only: - - master - - 3.12.x - - 3.15.x - - 3.18.x - -env: - global: - - CI_NODE_TOTAL=6 - # Quickest to build, fast performing, debugable builds. - - CFLAGS="-g1 -O1" - # upload log files, tarballs etc artifacts from the build. - - ARTIFACTS_BUCKET=cfengine-travis-artifacts - # 2 cores according to: https://docs.travis-ci.com/user/ci-environment/ - - MAKEFLAGS=-j3 - -# Parallel jobs listed here; fastest jobs should come first to give -# feedback ASAP. For more info read this: -# https://docs.travis-ci.com/user/multi-os/ -jobs: - fast_finish: true # Build will succeed once all linux jobs succeed - include: - - env: JOB_TYPE=compile_and_unit_test_asan - - env: JOB_TYPE=valgrind_health_check - - env: JOB_TYPE=compile_and_unit_test COVERAGE=no - compiler: clang - - env: JOB_TYPE=acceptance_tests_common - # The unsafe acceptance tests don't work with SIMFS which is the default - # filesystem in Travis; so change OS to Trusty, which uses ext4. - - env: JOB_TYPE=acceptance_tests_unsafe_serial_network_etc - - env: JOB_TYPE=serverd_multi_versions COVERAGE=no - -before_install: - - chmod ug+x ./travis-scripts/* - - ./travis-scripts/before_install.sh - -script: ./travis-scripts/script.sh - -after_success: ./travis-scripts/after_success.sh - -before_deploy: ./travis-scripts/before_deploy.sh - -after_script: ./travis-scripts/after_script.sh diff --git a/travis-scripts/after_script.sh b/travis-scripts/after_script.sh deleted file mode 100755 index 512ea2cabb..0000000000 --- a/travis-scripts/after_script.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -set +e -cd $TRAVIS_BUILD_DIR || return 1 -mkdir artifacts -test "x$DIST_TARBALL" != x && cp "$DIST_TARBALL" artifacts/ -mv config.log artifacts/ 2>/dev/null -mv tests/acceptance/summary.log artifacts/ 2>/dev/null -mv tests/acceptance/test.log artifacts/ 2>/dev/null -mv tests/acceptance/workdir artifacts/ 2>/dev/null -mv serverd-multi-versions-logs artifacts/ 2>/dev/null - -VERSION=$(expr "$DIST_TARBALL" : "cfengine-\(.*\).tar.gz") -VERSION=${VERSION:-master} -test "$TRAVIS_PULL_REQUEST" = "false" && BRANCH_OR_PULL_REQUEST=$TRAVIS_BRANCH || BRANCH_OR_PULL_REQUEST=PULL_$TRAVIS_PULL_REQUEST - -filename=cfengine-$VERSION-$BRANCH_OR_PULL_REQUEST-$JOB_TYPE.artifacts.zip -zip -q -r $filename artifacts/ - -echo ===== uploading $filename to file.io ===== -curl -F "file=@$filename" https://file.io -echo 'Note that file.io DELETES file from their servers after first download,' -echo "so don't delete it from your machine if you still need it!" - -cd - >/dev/null diff --git a/travis-scripts/after_success.sh b/travis-scripts/after_success.sh deleted file mode 100755 index 1a2485251c..0000000000 --- a/travis-scripts/after_success.sh +++ /dev/null @@ -1 +0,0 @@ -#!/bin/sh diff --git a/travis-scripts/before_install.sh b/travis-scripts/before_install.sh deleted file mode 100755 index 4d0833b30a..0000000000 --- a/travis-scripts/before_install.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -set -e -if [ "$TRAVIS_OS_NAME" = osx ] -then - set +e - rvm get stable - brew update - brew install lmdb - brew install make - brew install autoconf - brew install automake - brew install openssl - # brew install gcc@7 || brew link --overwrite gcc@7 - set -e - # gcc-7 --version - #brew install python - #brew install libxml2 - #brew install fakeroot -else - sudo rm -vf /etc/apt/sources.list.d/*riak* - sudo apt-get --quiet update - # Needed to build - sudo apt-get install -y libssl-dev libpam0g-dev - sudo apt-get install -y liblmdb-dev - # Needed to test - sudo apt-get install -y fakeroot - # Optional - sudo apt-get install -y libxml2-dev libacl1-dev - # Code coverage dependency: - sudo apt-get install -y lcov - # Ensure traditional yacc compatibility - sudo apt-get purge -y bison - sudo apt-get autoremove -y - sudo apt-get install -y byacc - sudo apt-get -qy install curl - - if [ "$JOB_TYPE" = valgrind_health_check ] - then - sudo apt-get install -y valgrind - fi -fi diff --git a/travis-scripts/script.sh b/travis-scripts/script.sh deleted file mode 100755 index 981a60fbd7..0000000000 --- a/travis-scripts/script.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh -set -e -set -x - -cd $TRAVIS_BUILD_DIR || exit 1 - -if [ "$JOB_TYPE" = valgrind_health_check ] -then - sudo bash travis-scripts/valgrind.sh - exit -fi - -INSTDIR=$HOME/cf_install - -# if [ "$JOB_TYPE" = style_check ] -# then -# # sh tests/misc/style_check.sh -# exit 0 -# fi - -# Fetch the tags from upstream even if we are on a -# foreign clone. Needed for determine-version.sh to work. -git remote add upstream https://github.com/cfengine/core.git \ - && git fetch --no-recurse-submodules upstream 'refs/tags/*:refs/tags/*' - -if [ "$TRAVIS_OS_NAME" = osx ] -then - ./autogen.sh --enable-debug --with-openssl="$(brew --prefix openssl)" --prefix=$INSTDIR --bindir=$INSTDIR/var/cfengine/bin - gmake --version - gmake CFLAGS="-Werror -Wall" - # Tests are disabled on OS X, because they started hanging in travis, - # for no apparent reason. - # gmake --debug -C tests/unit check - exit -else - NO_CONFIGURE=1 ./autogen.sh - ./configure --enable-debug --prefix=$INSTDIR --with-systemd-service --bindir=$INSTDIR/var/cfengine/bin \ - `[ "x$COVERAGE" != xno ] && echo --enable-coverage` -fi - -make dist - -DIST_TARBALL=`echo cfengine-*.tar.gz` -export DIST_TARBALL - -if [ "$JOB_TYPE" = compile_only ] -then - make CFLAGS="-Werror" -k -elif [ "$JOB_TYPE" = compile_and_unit_test ] -then - make CFLAGS="-Wall -Wextra -Werror -Wno-sign-compare" - make -C tests/unit check - make -C tests/load check - exit -elif [ "$JOB_TYPE" = compile_and_unit_test_asan ] -then - make CFLAGS="-Werror -Wall -fsanitize=address" LDFLAGS="-fsanitize=address" - make -C tests/unit CFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address" check - make -C tests/load CFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address" check - exit -else - make -fi - -cd tests/acceptance || exit 1 -chmod -R go-w . - -if [ "$JOB_TYPE" = acceptance_tests_common ] -then - ./testall --printlog --tests=common,errorlog - exit -fi - -# WARNING: the following job runs the selected tests as root! -# We are chmod'ing in the end so that code coverage data is readable from user -if [ "$JOB_TYPE" = acceptance_tests_unsafe_serial_network_etc ] -then - ./testall --gainroot=sudo --tests=timed,slow,errorexit,libxml2,libcurl,serial,network,unsafe - exit -fi - -if [ "$JOB_TYPE" = serverd_multi_versions ] -then - cd ../.. - set +e - tests/acceptance/serverd-multi-versions.sh - exit -fi