Skip to content

Commit

Permalink
Merge pull request EOSIO#6363 from EOSIO/release/1.4.x
Browse files Browse the repository at this point in the history
Release 1.4.4
  • Loading branch information
b1bart authored Nov 20, 2018
2 parents 11c2539 + e96965f commit 59626f1
Show file tree
Hide file tree
Showing 16 changed files with 445 additions and 98 deletions.
6 changes: 3 additions & 3 deletions .buildkite/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ steps:
echo "--- :spiral_note_pad: Generating Code Coverage Report" && \
/usr/bin/ninja EOSIO_ut_coverage && \
echo "--- :arrow_up: Publishing Code Coverage Report" && \
buildkite-agent artifact upload "EOSIO_ut_coverage/**/*" s3://eosio-coverage/$BUILDKITE_JOB_ID && \
buildkite-agent artifact upload "EOSIO_ut_coverage/**/*" s3://eos-coverage/$BUILDKITE_JOB_ID && \
cp /config/.coveralls.yml . && \
/usr/local/bin/coveralls-lcov EOSIO_ut_coverage_filtered.info && \
echo "+++ View Report" && \
printf "\033]1339;url=https://eosio-coverage.s3-us-west-2.amazonaws.com/$BUILDKITE_JOB_ID/EOSIO_ut_coverage/index.html;content=View Full Coverage Report\a\n"
printf "\033]1339;url=https://eos-coverage.s3-us-west-2.amazonaws.com/$BUILDKITE_JOB_ID/EOSIO_ut_coverage/index.html;content=View Full Coverage Report\a\n"
label: ":spiral_note_pad: Generate Report"
agents:
- "role=linux-coverage"
queue: "automation-large-builder-fleet"
plugins:
docker#v1.4.0:
image: "eosio/ci:ubuntu18"
Expand Down
40 changes: 20 additions & 20 deletions .buildkite/debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ steps:
tar -pczf build.tar.gz build/
label: ":ubuntu: Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:ubuntu"
workdir: /data/job
timeout: 60
Expand All @@ -34,10 +34,10 @@ steps:
tar -pczf build.tar.gz build/
label: ":ubuntu: 18.04 Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:ubuntu18"
workdir: /data/job
timeout: 60
Expand All @@ -49,10 +49,10 @@ steps:
tar -pczf build.tar.gz build/
label: ":fedora: Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:fedora"
workdir: /data/job
timeout: 60
Expand All @@ -64,10 +64,10 @@ steps:
tar -pczf build.tar.gz build/
label: ":centos: Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:centos"
workdir: /data/job
timeout: 60
Expand All @@ -79,10 +79,10 @@ steps:
tar -pczf build.tar.gz build/
label: ":aws: Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:amazonlinux"
workdir: /data/job
timeout: 60
Expand Down Expand Up @@ -122,13 +122,13 @@ steps:
limit: 1
label: ":ubuntu: Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
- "build/config.ini"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:ubuntu"
workdir: /data/job
timeout: 60
Expand All @@ -146,13 +146,13 @@ steps:
limit: 1
label: ":ubuntu: 18.04 Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
- "build/config.ini"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:ubuntu18"
workdir: /data/job
timeout: 60
Expand All @@ -170,13 +170,13 @@ steps:
limit: 1
label: ":fedora: Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
- "build/config.ini"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:fedora"
workdir: /data/job
timeout: 60
Expand All @@ -194,13 +194,13 @@ steps:
limit: 1
label: ":centos: Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
- "build/config.ini"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:centos"
workdir: /data/job
timeout: 60
Expand All @@ -218,13 +218,13 @@ steps:
limit: 1
label: ":aws: Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
- "build/config.ini"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:amazonlinux"
workdir: /data/job
timeout: 60
74 changes: 74 additions & 0 deletions .buildkite/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
steps:
- command: |
echo "AUTHENTICATING GOOGLE SERVICE ACCOUNT" && \
gcloud --quiet auth activate-service-account [email protected] --key-file=/etc/gcp-service-account.json && \
docker-credential-gcr configure-docker && \
echo "BUILDING BUILD IMAGE" && \
cd Docker/builder && \
docker build -t eosio/builder:latest -t eosio/builder:$BUILDKITE_COMMIT . --build-arg branch=$BUILDKITE_COMMIT && \
docker tag eosio/builder:$BUILDKITE_COMMIT gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
docker tag eosio/builder:latest gcr.io/b1-automation-dev/eosio/builder:latest && \
echo "PUSHING DOCKER IMAGES" && \
docker push gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
docker push gcr.io/b1-automation-dev/eosio/builder:latest && \
echo "TRASHING OLD IMAGES" && \
docker rmi eosio/builder:$BUILDKITE_COMMIT && \
docker rmi eosio/builder:latest && \
docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
docker rmi gcr.io/b1-automation-dev/eosio/builder:latest
label: "Docker build builder"
agents:
queue: "automation-docker-builder-fleet"
timeout: 300
- wait

- command: |
echo "AUTHENTICATING GOOGLE SERVICE ACCOUNT" && \
gcloud --quiet auth activate-service-account [email protected] --key-file=/etc/gcp-service-account.json && \
docker-credential-gcr configure-docker && \
echo "BUILDING EOS IMAGE" && \
docker pull gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
cd Docker && \
docker build -t eosio/eos:latest -t eosio/eos:$BUILDKITE_COMMIT . --build-arg branch=$BUILDKITE_BRANCH && \
docker tag eosio/eos:$BUILDKITE_COMMIT gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_COMMIT && \
docker tag eosio/eos:latest gcr.io/b1-automation-dev/eosio/eos:latest && \
echo "PUSHING DOCKER IMAGES" && \
docker push gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_COMMIT && \
docker push gcr.io/b1-automation-dev/eosio/eos:latest && \
echo "TRASHING OLD IMAGES" && \
docker rmi eosio/eos:$BUILDKITE_COMMIT && \
docker rmi eosio/eos:latest && \
docker rmi gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_COMMIT && \
docker rmi gcr.io/b1-automation-dev/eosio/eos:latest && \
docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT
label: "Docker build eos"
agents:
queue: "automation-docker-builder-fleet"
timeout: 300
- command: |
echo "AUTHENTICATING GOOGLE SERVICE ACCOUNT" && \
gcloud --quiet auth activate-service-account [email protected] --key-file=/etc/gcp-service-account.json && \
docker-credential-gcr configure-docker && \
echo "BUILDING EOS DEV IMAGE" && \
docker pull gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
cd Docker/dev && \
docker build -t eosio/eos-dev:latest -t eosio/eos-dev:$BUILDKITE_COMMIT . --build-arg branch=$BUILDKITE_BRANCH && \
docker tag eosio/eos-dev:$BUILDKITE_COMMIT gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_COMMIT && \
docker tag eosio/eos-dev:latest gcr.io/b1-automation-dev/eosio/eos-dev:latest && \
echo "PUSHING DOCKER IMAGES" && \
docker push gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_COMMIT && \
docker push gcr.io/b1-automation-dev/eosio/eos-dev:latest && \
echo "TRASHING OLD IMAGES" && \
docker rmi eosio/eos-dev:$BUILDKITE_COMMIT && \
docker rmi eosio/eos-dev:latest && \
docker rmi gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_COMMIT && \
docker rmi gcr.io/b1-automation-dev/eosio/eos-dev:latest && \
docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT
label: "Docker build eos-dev"
agents:
queue: "automation-docker-builder-fleet"
timeout: 300
- wait
20 changes: 10 additions & 10 deletions .buildkite/long_running_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ steps:
tar -pczf build.tar.gz build/
label: ":ubuntu: Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
Expand All @@ -34,7 +34,7 @@ steps:
tar -pczf build.tar.gz build/
label: ":ubuntu: 18.04 Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
Expand All @@ -49,7 +49,7 @@ steps:
tar -pczf build.tar.gz build/
label: ":fedora: Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
Expand All @@ -64,7 +64,7 @@ steps:
tar -pczf build.tar.gz build/
label: ":centos: Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
Expand All @@ -79,7 +79,7 @@ steps:
tar -pczf build.tar.gz build/
label: ":aws: Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
Expand Down Expand Up @@ -116,7 +116,7 @@ steps:
cd /data/job/build && ctest -L long_running_tests --output-on-failure
label: ":ubuntu: Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
Expand All @@ -137,7 +137,7 @@ steps:
cd /data/job/build && ctest -L long_running_tests --output-on-failure
label: ":ubuntu: 18.04 Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
Expand All @@ -158,7 +158,7 @@ steps:
cd /data/job/build && ctest -L long_running_tests --output-on-failure
label: ":fedora: Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
Expand All @@ -179,7 +179,7 @@ steps:
cd /data/job/build && ctest -L long_running_tests --output-on-failure
label: ":centos: Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
Expand All @@ -200,7 +200,7 @@ steps:
cd /data/job/build && ctest -L long_running_tests --output-on-failure
label: ":aws: Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
Expand Down
Loading

0 comments on commit 59626f1

Please sign in to comment.