-
Notifications
You must be signed in to change notification settings - Fork 79
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactored the OSB build system #632
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,128 +1,40 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # Licensed to Elasticsearch B.V. under one or more contributor | ||
| # license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright | ||
| # ownership. Elasticsearch B.V. licenses this file to you 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. | ||
|
|
||
| # fail this script immediately if any command fails with a non-zero exit code | ||
| set -e | ||
| # fail on pipeline errors, e.g. when grepping | ||
| set -o pipefail | ||
| # fail on any unset environment variables | ||
| set -u | ||
|
|
||
| function update_pyenv { | ||
| # need to have the latest pyenv version to ensure latest patch releases are installable | ||
| cd $HOME/.pyenv/plugins/python-build/../.. && git pull origin master --rebase && cd - | ||
| pyenv_init() { | ||
| PATH=$HOME/.pyenv/shims:$PATH:$HOME/.pyenv/bin | ||
| } | ||
|
|
||
| function build { | ||
| function setup { | ||
| export THESPLOG_FILE="${THESPLOG_FILE:-${BENCHMARK_HOME}/.benchmark/logs/actor-system-internal.log}" | ||
| # this value is in bytes, the default is 50kB. We increase it to 200kiB. | ||
| export THESPLOG_FILE_MAXSIZE=${THESPLOG_FILE_MAXSIZE:-204800} | ||
| # adjust the default log level from WARNING | ||
| export THESPLOG_THRESHOLD="INFO" | ||
|
|
||
| # turn nounset off because some of the following commands fail if nounset is turned on | ||
| set +u | ||
|
|
||
| export PATH="$HOME/.pyenv/bin:$PATH" | ||
| pyenv_init | ||
| export TERM=dumb | ||
| export LC_ALL=en_US.UTF-8 | ||
| update_pyenv | ||
| eval "$(pyenv init -)" | ||
| # ensure pyenv shims are added to PATH, see https://github.com/pyenv/pyenv/issues/1906 | ||
| eval "$(pyenv init --path)" | ||
| eval "$(pyenv virtualenv-init -)" | ||
| } | ||
|
|
||
| function build { | ||
| setup | ||
|
|
||
| make prereq | ||
| make install | ||
| make precommit | ||
| set -e | ||
| make install-devel | ||
| make lint | ||
| make test | ||
| } | ||
|
|
||
| function build_it { | ||
| export THESPLOG_FILE="${THESPLOG_FILE:-${BENCHMARK_HOME}/.benchmark/logs/actor-system-internal.log}" | ||
| # this value is in bytes, the default is 50kB. We increase it to 200kiB. | ||
| export THESPLOG_FILE_MAXSIZE=${THESPLOG_FILE_MAXSIZE:-204800} | ||
| # adjust the default log level from WARNING | ||
| export THESPLOG_THRESHOLD="INFO" | ||
| setup | ||
|
|
||
| # turn nounset off because some of the following commands fail if nounset is turned on | ||
| set +u | ||
|
|
||
| export PATH="$HOME/.pyenv/bin:$PATH" | ||
| export TERM=dumb | ||
| export LC_ALL=en_US.UTF-8 | ||
| export BENCHMARK_HOME="$GITHUB_WORKSPACE" | ||
|
|
||
| update_pyenv | ||
| eval "$(pyenv init -)" | ||
| # ensure pyenv shims are added to PATH, see https://github.com/pyenv/pyenv/issues/1906 | ||
| eval "$(pyenv init --path)" | ||
| eval "$(pyenv virtualenv-init -)" | ||
|
|
||
| python3_version=`python3 --version` | ||
| echo "Python3 version is ... $python3_version" | ||
|
|
||
| python3 -m pip install opensearch-benchmark | ||
| docker pull ubuntu/squid:latest | ||
|
|
||
| make prereq | ||
| make install | ||
| make precommit | ||
|
|
||
| # make it38, it39, etc. | ||
| # make it38, it39, etc. so they run as concurrent GHA jobs | ||
| make "it${1//./}" | ||
| } | ||
|
|
||
| function license-scan { | ||
| # turn nounset off because some of the following commands fail if nounset is turned on | ||
| set +u | ||
|
|
||
| export PATH="$HOME/.pyenv/bin:$PATH" | ||
| eval "$(pyenv init -)" | ||
| # ensure pyenv shims are added to PATH, see https://github.com/pyenv/pyenv/issues/1906 | ||
| eval "$(pyenv init --path)" | ||
| eval "$(pyenv virtualenv-init -)" | ||
|
|
||
| make prereq | ||
| # only install depdencies that are needed by end users | ||
| make install-user | ||
| fossa analyze | ||
| } | ||
|
|
||
| function archive { | ||
| # Treat unset env variables as an error, but only in this function as there are other functions that allow unset variables | ||
| set -u | ||
|
|
||
| # this will only be done if the build number variable is present | ||
| BENCHMARK_DIR=${BENCHMARK_HOME}/.benchmark | ||
| if [[ -d ${BENCHMARK_DIR} ]]; then | ||
| find ${BENCHMARK_DIR} -name "*.log" -printf "%P\\0" | tar -cvjf ${BENCHMARK_DIR}/${BUILD_NUMBER}.tar.bz2 -C ${BENCHMARK_DIR} --transform "s,^,ci-${BUILD_NUMBER}/," --null -T - | ||
| else | ||
| echo "Benchmark directory [${BENCHMARK_DIR}] not present. Ensure the BENCHMARK_DIR environment variable is correct" | ||
| exit 1 | ||
| fi | ||
| } | ||
| $@ | ||
|
|
||
| if declare -F "$1" > /dev/null; then | ||
| "$@" | ||
| exit | ||
| else | ||
| echo "Please specify a function to run" | ||
| exit 1 | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand your changes here but this change combined with the Dockerfile change basically cause the docker-build check to be inaccurate.
It will only check docker build based on merged code, instead of the commit sent with the PR. You can only detect issues once you merge the code, which defeat the purpose of PR check.
My original design was meant to have test mode testing the PR commit, while prod mode use the original pypi method. I think we should bring back the test mode, but only change prod mode to build from source instead of pulling from pypi, which should be the best of both approaches. Thanks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The updated changes should pull in the PR commit now.