Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Remove support of Ubuntu16 and CentOS8 epe940 #10421

Merged
merged 5 commits into from
Jun 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions .cicd/base-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,7 @@ steps:
cd: ~
agents: "queue=mac-anka-node-fleet"
timeout: 180

- label: ":ubuntu: Ubuntu 16.04 - Base Image Pinned"
command:
- "./.cicd/generate-base-images.sh"
env:
FORCE_BASE_IMAGE: true
IMAGE_TAG: ubuntu-16.04-pinned
PLATFORM_TYPE: pinned
agents:
queue: "automation-eks-eos-builder-fleet"
timeout: 180


- label: ":ubuntu: Ubuntu 18.04 - Base Image Pinned"
command:
- "./.cicd/generate-base-images.sh"
Expand Down
36 changes: 1 addition & 35 deletions .cicd/build-scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,6 @@ steps:
- "./scripts/eosio_build.sh -P -y"
timeout: 180

- label: ":centos: CentOS 8 - Build Pinned"
plugins:
- docker#v3.3.0:
image: "centos:8"
always-pull: true
agents:
queue: "automation-eks-eos-builder-fleet"
command:
- "./scripts/eosio_build.sh -P -y"
timeout: 180

- label: ":darwin: macOS 10.15 - Build Pinned"
env:
REPO: "git@github.com:EOSIO/eos.git"
Expand Down Expand Up @@ -61,19 +50,7 @@ steps:
- EOSIO/skip-checkout#v0.1.1:
cd: ~
timeout: 180

- label: ":ubuntu: Ubuntu 16.04 - Build Pinned"
plugins:
- docker#v3.3.0:
image: "ubuntu:16.04"
always-pull: true
agents:
queue: "automation-eks-eos-builder-fleet"
command:
- "apt update && apt upgrade -y && apt install -y git"
- "./scripts/eosio_build.sh -P -y"
timeout: 180


- label: ":ubuntu: Ubuntu 18.04 - Build Pinned"
plugins:
- docker#v3.3.0:
Expand Down Expand Up @@ -123,17 +100,6 @@ steps:
- "./scripts/eosio_build.sh -y"
timeout: 180

- label: ":centos: CentOS 8 - Build UnPinned"
plugins:
- docker#v3.3.0:
image: "centos:8"
always-pull: true
agents:
queue: "automation-eks-eos-builder-fleet"
command:
- "./scripts/eosio_build.sh -y"
timeout: 180

- label: ":darwin: macOS 10.15 - Build UnPinned"
env:
REPO: "git@github.com:EOSIO/eos.git"
Expand Down
28 changes: 0 additions & 28 deletions .cicd/generate-pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -569,34 +569,6 @@ cat <<EOF
timeout: ${TIMEOUT:-10}
skip: ${SKIP_CENTOS_7_7}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}

- label: ":centos: CentOS 8 - Package Builder"
command:
- "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 8 - Build' && tar -xzf build.tar.gz"
- "./.cicd/package.sh"
env:
IMAGE_TAG: "centos-8-$PLATFORM_TYPE"
PLATFORM_TYPE: $PLATFORM_TYPE
OS: "el8" # OS and PKGTYPE required for lambdas
PKGTYPE: "rpm"
agents:
queue: "$BUILDKITE_TEST_AGENT_QUEUE"
timeout: ${TIMEOUT:-10}
skip: ${SKIP_CENTOS_8}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}

- label: ":ubuntu: Ubuntu 16.04 - Package Builder"
command:
- "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 16.04 - Build' && tar -xzf build.tar.gz"
- "./.cicd/package.sh"
env:
IMAGE_TAG: "ubuntu-16.04-$PLATFORM_TYPE"
PLATFORM_TYPE: $PLATFORM_TYPE
OS: "ubuntu-16.04" # OS and PKGTYPE required for lambdas
PKGTYPE: "deb"
agents:
queue: "$BUILDKITE_TEST_AGENT_QUEUE"
timeout: ${TIMEOUT:-10}
skip: ${SKIP_UBUNTU_16_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}

- label: ":ubuntu: Ubuntu 18.04 - Package Builder"
command:
- "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 18.04 - Build' && tar -xzf build.tar.gz"
Expand Down
6 changes: 3 additions & 3 deletions .cicd/metrics/test-metrics.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ function getOS(environment)
return 'High Sierra';
if (/mojave/.test(label))
return 'Mojave';
if (/ubuntu.*16.*04/.test(label) || /ubuntu.*16(?!.*10)/.test(label))
return 'Ubuntu 16.04';
if (/ubuntu.*20.*04/.test(label) || /ubuntu.*20(?!.*10)/.test(label))
return 'Ubuntu 20.04';
if (/ubuntu.*18.*04/.test(label) || /ubuntu.*18(?!.*10)/.test(label))
return 'Ubuntu 18.04';
if (/docker/.test(label))
Expand Down Expand Up @@ -428,4 +428,4 @@ async function main()
return (inBuildkite) ? process.exit(EXIT_SUCCESS) : process.exit(errorCount);
};

main();
main();
75 changes: 0 additions & 75 deletions .cicd/platforms/pinned/centos-8-pinned.dockerfile

This file was deleted.

72 changes: 0 additions & 72 deletions .cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile

This file was deleted.

59 changes: 0 additions & 59 deletions .cicd/platforms/unpinned/centos-8-unpinned.dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/eosio_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ if [[ $ARCH == "Linux" ]]; then
install-package cmake
fi
fi
elif [[ ${NAME} == "CentOS Linux" && "$(echo ${VERSION} | sed 's/ .*//g')" == 8 ]] || [[ ${NAME} == "Amazon Linux" ]] ; then
elif [[ ${NAME} == "Amazon Linux" ]] ; then
install-package cmake3
fi
fi
Expand Down
Loading