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

[develop] Fix U18 develop build. #994

Merged
merged 3 commits into from
Nov 9, 2020
Merged

[develop] Fix U18 develop build. #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
524f4fe
Fix specification of contract builder for Buildkite build and integra…
scottarnette Nov 6, 2020
76a0117
Fix set placement in integration test script.
scottarnette Nov 6, 2020
59f70ce
Thanks Mike!
scottarnette Nov 6, 2020
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
3 changes: 3 additions & 0 deletions .cicd/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ else # Linux
if [[ $BUILDKITE == true ]]; then
# Generate Base Images
$CICD_DIR/generate-base-images.sh
if [[ "$IMAGE_TAG" == 'ubuntu-18.04' ]]; then
FULL_TAG='eosio/ci-contracts-builder:base-ubuntu-18.04-develop'
scottarnette marked this conversation as resolved.
Show resolved Hide resolved
fi
fi

COMMANDS="$PRE_COMMANDS && $BUILD_COMMANDS"
Expand Down
7 changes: 6 additions & 1 deletion .cicd/integration-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,13 @@ if [[ -f $BUILDKITE_ENV_FILE ]]; then
evars="$evars --env ${var%%=*}"
done < "$BUILDKITE_ENV_FILE"
fi

if [[ "$BUILDKITE" == 'true' && "$IMAGE_TAG" == 'ubuntu-18.04' ]]; then
FULL_TAG='eosio/ci-contracts-builder:base-ubuntu-18.04-develop'
fi

set +e
eval docker run $ARGS $evars $IMAGE_TAG bash -c \"$COMMANDS\"
eval docker run $ARGS $evars $FULL_TAG bash -c \"$COMMANDS\"
EXIT_STATUS=$?

# buildkite
Expand Down
4 changes: 2 additions & 2 deletions .cicd/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ steps:
- "./.cicd/build.sh"
- "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
env:
IMAGE_TAG: "eosio/ci-contracts-builder:base-ubuntu-18.04-develop"
IMAGE_TAG: "ubuntu-18.04"
agents:
queue: "automation-eks-eos-builder-fleet"
timeout: ${TIMEOUT:-60}
Expand Down Expand Up @@ -321,7 +321,7 @@ steps:
- "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 18.04 - Build' --agent-access-token $$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
- "./.cicd/integration-tests.sh"
env:
IMAGE_TAG: "eosio/ci-contracts-builder:base-ubuntu-18.04-develop"
IMAGE_TAG: "ubuntu-18.04"
agents:
queue: "automation-eks-eos-tester-fleet"
timeout: ${TIMEOUT:-10}
Expand Down