Skip to content

Save 3 keystroke on build.sh #6

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.

Sign up for GitHub

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

Merged
cbeauchesne merged 1 commit into from
Oct 6, 2021
Merged

Save 3 keystroke on build.sh #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion docs/CI/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ A valid `DD_API_KEY` env var for staging must be set.

1. Clone this repo
2. Copy paste your components' build inside `./binaries` (See [documentation](./binaries.md))
3. `./build.sh` with relevant `library` (see [documentation](../execute/build.md)). Exemple: `./build.sh -l java`
3. `./build.sh` with relevant `library` (see [documentation](../execute/build.md)). Exemple: `./build.sh java`
4. `./run.sh`

You will find different template:
Expand Down
7 changes: 3 additions & 4 deletions docs/execute/build.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ Build images used for system tests.
## Usage

```bash
./build.sh [--library <library_name>] [--images <image_names>] [--weblog-variant <variant_name>]
./build.sh <library_name> [--images <image_names>] [--weblog-variant <variant_name>]
```

## Options

* `-l`: library to test See LIBRARIES section. Default: `nodejs`
* `--library`: Same as `-l`
* `<library_name>`: library to test. See LIBRARIES section.
* `-i`: Comma separated list of images you need to build. See *Image names* section for possible values. Default: all of them
* `--images`: Same as `-i`
* `-w`: Name of a [weblog](../edit/weblog.md) variation
Expand Down Expand Up @@ -59,6 +58,6 @@ version **against** production version of other components.

You can define your setup in environment variable in a `.env` file. Here is the mapping:

* `<library_name>` => `TEST_LIBRARY`
* `-i`/`--images` => `BUILD_IMAGES`
* `-l`/`--library` => `TEST_LIBRARY`
* `-w`/`--weblog-variant` => `WEBLOG_VARIANT`
3 changes: 2 additions & 1 deletion utils/build/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ DESCRIPTION

USAGE

./build.sh [--images <image_names>] [--library <library_name>] [--weblog-variant <variant_name>]
./build.sh <library_name> [--images <image_names>] [--weblog-variant <variant_name>]

<library_name> can be one of cpp, dotnet, golang, java, nodejs, php, python or ruby.

More info on https://github.com/DataDog/system-tests/blob/master/docs/CLI/build.md

1 change: 1 addition & 0 deletions utils/build/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ WEBLOG_VARIANT=${WEBLOG_VARIANT:-${HTTP_FRAMEWORK}}

while [[ "$#" -gt 0 ]]; do
case $1 in
cpp|dotnet|golang|java|nodejs|php|python|ruby) TEST_LIBRARY="$1";;
-l|--library) TEST_LIBRARY="$2"; shift ;;
-i|--images) BUILD_IMAGES="$2"; shift ;;
-w|--weblog-variant) WEBLOG_VARIANT="$2"; shift ;;
Expand Down