From 3216a169590c70cd0ba0125eb973668bf0cd5e1a Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Mon, 21 Sep 2020 21:15:42 -0700 Subject: [PATCH] Remove unused Travis configuration Remove related stale cri release files Signed-off-by: Derek McGowan --- .travis.yml | 123 ----------------------------- Makefile | 4 - script/release/deploy-cri | 40 ---------- script/release/gcp-secret.json.enc | Bin 2352 -> 0 bytes script/release/release-cri | 39 --------- 5 files changed, 206 deletions(-) delete mode 100644 .travis.yml delete mode 100755 script/release/deploy-cri delete mode 100644 script/release/gcp-secret.json.enc delete mode 100755 script/release/release-cri diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2791ee716..000000000 --- a/.travis.yml +++ /dev/null @@ -1,123 +0,0 @@ -dist: bionic -sudo: required - -branches: - except: - - master - -# setup travis so that we can run containers for integration tests -services: - - docker - -language: go - -os: -- linux - -go: - - "1.15.2" - -env: - - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct - - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v2 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic TRAVIS_RELEASE=yes GOPROXY=direct - - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v2 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct RUNC_FLAVOR=crun - - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runtime.v1.linux TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct - -matrix: - include: - # Skip testing previous LTS (Xenial / Ubuntu 16.04 LTS) on pull requests - - if: type != pull_request - os: linux - dist: xenial - env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v2 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=xenial GOPROXY=direct - -go_import_path: github.com/containerd/containerd - -addons: - apt: - packages: - - btrfs-tools - - libnl-3-dev - - libnet-dev - - protobuf-c-compiler - # - protobuf-compiler - - python-minimal - - libcap-dev - - libaio-dev - - libprotobuf-c-dev - - libprotobuf-dev - -before_install: - - uname -r - -install: - - sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-protobuf - - sudo chmod +x /usr/local/bin/protoc - - sudo chmod og+rx /usr/local/include/google /usr/local/include/google/protobuf /usr/local/include/google/protobuf/compiler - - sudo chmod -R og+r /usr/local/include/google/protobuf/ - - protoc --version - - if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-seccomp ; fi - - if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-runc ; fi - - if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-cni ; fi - - if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-critools ; fi - - if [ "$TRAVIS_GOOS" = "linux" ]; then wget https://github.com/checkpoint-restore/criu/archive/v3.13.tar.gz -O /tmp/criu.tar.gz ; fi - - if [ "$TRAVIS_GOOS" = "linux" ]; then tar -C /tmp/ -zxf /tmp/criu.tar.gz ; fi - - if [ "$TRAVIS_GOOS" = "linux" ]; then cd /tmp/criu-3.13 && sudo make install-criu ; fi - - cd $TRAVIS_BUILD_DIR - -script: - - export GOOS=$TRAVIS_GOOS - - export CGO_ENABLED=$TRAVIS_CGO_ENABLED - - GOOS=linux GO111MODULE=off script/setup/install-dev-tools - - go build -i . - - make build - - make binaries - - if [ "$TRAVIS_GOOS" = "linux" ]; then sudo make install ; fi - - if [ "$TRAVIS_GOOS" = "linux" ]; then make coverage ; fi - - if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH make root-coverage ; fi - - if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH make integration EXTRA_TESTFLAGS=-no-criu ; fi - # Run the integration suite a second time. See discussion in github.com/containerd/containerd/pull/1759 - - if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH TESTFLAGS_PARALLEL=1 make integration EXTRA_TESTFLAGS=-no-criu ; fi - - | - if [ "$TRAVIS_GOOS" = "linux" ]; then - sudo mkdir -p /etc/containerd - sudo bash -c "cat > /etc/containerd/config.toml < /tmp/containerd-cri.log & - sudo ctr version - sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=/var/run/containerd/containerd.sock --parallel=8 - TEST_RC=$? - test $TEST_RC -ne 0 && cat /tmp/containerd-cri.log - sudo pkill containerd - sudo rm -rf /etc/containerd - test $TEST_RC -eq 0 || /bin/false - fi - -after_success: - - bash <(curl -s https://codecov.io/bash) -F linux - -before_deploy: - - if [ "$TRAVIS_RELEASE" = "yes" ]; then make release cri-release; fi - -deploy: - - provider: releases - api_key: - secure: HO+WSIVVUMMsbU74x+YyFsTP3ahqnR4xjwKAziedJ5lZXKJszQBhiYTFmcTeVBoouNjTISd07GQzpoLChuGC20U3+1NbT+CkK8xWR/x1ao2D3JY3Ds6AD9ubWRNWRLptt/xOn5Vq3F8xZyUYchwvDMl4zKCuTKxQGVdHKsINb2DehKcP5cVL6MMvqzEdfj2g99vqXAqs8uuo6dOmvxmHV43bfzDaAJSabjZZs6TKlWTqCQMet8uxyx2Dmjl2lxLwdqv12oJdrszacasn41NYuEyHI2bXyef1mhWGYN4n9bU/Y5winctZ8DOSOZvYg/2ziAaUN0+CTn1IESwVesrPz23P2Sy7wdLxu8dSIZ2yUHl7OsA5T5a5rDchAGguRVNBWvoGtuepEhdRacxTQUo1cMFZsEXjgRKKjdfc1emYQPVdN8mBv8GJwndty473ZXdvFt5R0kNVFtvWuYCa6UYJD2cKrsPSAfbZCDC/LiR3FOoTaUPMZUVkR2ACEO7Dn4+KlmBajqT40Osk/A7k1XA/TzVhMIpLtE0Vk2DfPmGsjCv8bC+MFd+R2Sc8SFdE92oEWRdoPQY5SxMYQtGxA+cbKVlT1kSw6y80yEbx5JZsBnT6+NTHwmDO3kVU9ztLdawOozTElKNAK8HoAyFmzIZ3wL64oThuDrv/TUuY8Iyn814= - file_glob: true - file: - - releases/*.tar.gz - - releases/*.tar.gz.sha256sum - skip_cleanup: true - on: - repo: containerd/containerd - tags: true - condition: $TRAVIS_GOOS = linux - - provider: script - script: bash script/release/deploy-cri - skip_cleanup: true - on: - repo: containerd/containerd - tags: true - condition: $TRAVIS_GOOS = linux diff --git a/Makefile b/Makefile index c0fecb9a6..09acf6b4e 100644 --- a/Makefile +++ b/Makefile @@ -249,10 +249,6 @@ release: $(BINARIES) releases/$(RELEASE).tar.gz @echo "$(WHALE) $@" @cd releases && sha256sum $(RELEASE).tar.gz >$(RELEASE).tar.gz.sha256sum -cri-release: $(BINARIES) releases/$(RELEASE).tar.gz - @echo "$(WHALE) $@" - @VERSION=$(VERSION:v%=%) script/release/release-cri - clean: ## clean up binaries @echo "$(WHALE) $@" @rm -f $(BINARIES) diff --git a/script/release/deploy-cri b/script/release/deploy-cri deleted file mode 100755 index 7fefab4ec..000000000 --- a/script/release/deploy-cri +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -# Copyright The containerd Authors. - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Deploy the cri-containerd release tarball to gcs. -# -set -eu -o pipefail - -ROOT=${GOPATH}/src/github.com/containerd/containerd -BUCKET="gs://cri-containerd-release" - -rm -rf "${HOME}/google-cloud-sdk" -export CLOUDSDK_CORE_DISABLE_PROMPTS=1 -curl https://sdk.cloud.google.com | bash > /dev/null -gcloud version - -openssl aes-256-cbc -K $encrypted_5a565171e51f_key -iv $encrypted_5a565171e51f_iv -in "${ROOT}/script/release/gcp-secret.json.enc" -out gcp-secret.json -d -gcloud auth activate-service-account --key-file gcp-secret.json --project=k8s-cri-containerd - -for file in $(ls "${ROOT}"/releases/cri/*.tar.gz.sha256); do - output="$(gsutil cp -n "${file}" "${BUCKET}" 2>&1)" - if [[ "$output" =~ "Skipping existing item" ]];then - echo "$(basename ${file}) already exists, skip the release tarball" - continue - fi - gsutil cp "${file%.sha256}" "${BUCKET}" -done diff --git a/script/release/gcp-secret.json.enc b/script/release/gcp-secret.json.enc deleted file mode 100644 index fb21f72e3d9b5c79b7c2b650ba72c9163f8882f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2352 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 WUwQ!clGq?IK~2-T07jtME-+xX$b9$! diff --git a/script/release/release-cri b/script/release/release-cri deleted file mode 100755 index 66abba9b1..000000000 --- a/script/release/release-cri +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -# Copyright The containerd Authors. - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Releases and publishes cri-containerd release tarball. -# -set -eu -o pipefail - -if [[ -z "${VERSION:-}" ]]; then - echo "VERSION is not set" - exit 1 -fi - -ROOT=${GOPATH}/src/github.com/containerd/containerd -CRI_COMMIT=$(grep github.com/containerd/cri ${ROOT}/vendor.conf | awk '{print $2}') - -go get -d github.com/containerd/cri/... -cd $GOPATH/src/github.com/containerd/cri -git checkout $CRI_COMMIT -make clean -make release TARBALL_PREFIX=cri-containerd LOCAL_RELEASE=true VERSION=${VERSION} VENDOR=${ROOT}/vendor.conf -make release TARBALL_PREFIX=cri-containerd-cni LOCAL_RELEASE=true INCLUDE_CNI=true VERSION=${VERSION} VENDOR=${ROOT}/vendor.conf - -mkdir -p ${ROOT}/releases/cri -cp _output/*.tar.gz ${ROOT}/releases/cri -cp _output/*.tar.gz.sha256 ${ROOT}/releases/cri