From 8cd321432f2cba3d9b780b7254704b38e0fc87a5 Mon Sep 17 00:00:00 2001 From: Ethan Dennis Date: Wed, 14 Sep 2022 10:25:58 -0700 Subject: [PATCH] Prefer --output-dir to -o --- azure_devops/2-audit.md | 2 +- azure_devops/3-dry-run.md | 4 ++-- azure_devops/4-custom-transformers.md | 4 ++-- azure_devops/6-forecast.md | 2 +- gitlab/6-forecast.md | 2 +- jenkins/3-dry-run.md | 2 +- jenkins/4-custom-transformers.md | 4 ++-- jenkins/6-forecast.md | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/azure_devops/2-audit.md b/azure_devops/2-audit.md index 1a2d327..fd1147a 100644 --- a/azure_devops/2-audit.md +++ b/azure_devops/2-audit.md @@ -28,7 +28,7 @@ You will now perform an audit against the bootstrapped Azure DevOps project. Ans 2. Run the following command from the root directory: ```bash - gh valet audit azure-devops --output-dir tmp/audit --namespace valet + gh valet audit azure-devops --output-dir tmp/audit ``` __Note__: The Azure DevOps organization and project name can be omitted from the `audit` command because they were persisted in the `.env.local` file in the [configure lab](./1-configure.md). You can optionally provide these arguments on the command line with the `--azure-devops-organization` and `--azure-devops-project` CLI options. diff --git a/azure_devops/3-dry-run.md b/azure_devops/3-dry-run.md index da6ac9a..ac60718 100644 --- a/azure_devops/3-dry-run.md +++ b/azure_devops/3-dry-run.md @@ -13,7 +13,7 @@ In this lab you will use the `dry-run` command to convert an Azure DevOps pipeli You will perform a dry run for a pipeline in the bootstrapped Azure DevOps project. Answer the following questions before running this command: 1. What is the id of the pipeline to convert? - - __:id__. This id can be found by: + - __:pipeline_id__. This id can be found by: - Navigating to the build pipelines in the bootstrapped Azure DevOps project - Selecting the pipeline with the name "valet-pipeline1" - Inspecting the URL to locate the pipeline id @@ -27,7 +27,7 @@ You will perform a dry run for a pipeline in the bootstrapped Azure DevOps proje 2. Run the following command from the root directory: ```bash - gh valet dry-run azure-devops pipeline --pipeline-id :pipeline_id -o tmp/dry-run-lab + gh valet dry-run azure-devops pipeline --pipeline-id :pipeline_id --output-dir tmp/dry-run-lab ``` 3. The command will list all the files written to disk when the command succeeds. diff --git a/azure_devops/4-custom-transformers.md b/azure_devops/4-custom-transformers.md index e3edce9..cec9e8a 100644 --- a/azure_devops/4-custom-transformers.md +++ b/azure_devops/4-custom-transformers.md @@ -33,7 +33,7 @@ You will perform a dry-run for a pipeline in the bootstrapped Azure DevOps proje 2. Run the following command from the root directory: ```bash - gh valet dry-run azure-devops pipeline --pipeline-id :pipeline_id -o tmp/dry-run-lab + gh valet dry-run azure-devops pipeline --pipeline-id :pipeline_id --output-dir tmp/dry-run-lab ``` 3. The command will list all the files written to disk when the command succeeds. @@ -127,7 +127,7 @@ This method can use any valid ruby syntax and should return a `Hash` that repres Now you can perform another `dry-run` command and use the `--custom-transformers` CLI option to provide this custom transformer. Run the following command within your codespace terminal: ```bash -gh valet dry-run azure-devops pipeline --pipeline-id :pipeline_id -o tmp/dry-run-lab --custom-transformers transformers.rb +gh valet dry-run azure-devops pipeline --pipeline-id :pipeline_id --output-dir tmp/dry-run-lab --custom-transformers transformers.rb ``` Open the workflow that is generated and inspect the contents. Now the `DotnetCoreCLI@2` steps are converted using the customized behavior! diff --git a/azure_devops/6-forecast.md b/azure_devops/6-forecast.md index 0937dba..e9a9e9c 100644 --- a/azure_devops/6-forecast.md +++ b/azure_devops/6-forecast.md @@ -40,7 +40,7 @@ Answer the following questions before running the `forecast` command: 5. Run the following `forecast` command while specifying the path to the sample json files: ```bash - gh valet forecast azure-devops -o ./tmp/forecast_reports --source-file-path azure_devops/bootstrap/jobs.json + gh valet forecast azure-devops --output-dir ./tmp/forecast_reports --source-file-path azure_devops/bootstrap/jobs.json ``` 6. The command will list all the files written to disk when the command succeeds. diff --git a/gitlab/6-forecast.md b/gitlab/6-forecast.md index e28a7ef..897270d 100644 --- a/gitlab/6-forecast.md +++ b/gitlab/6-forecast.md @@ -92,7 +92,7 @@ You can use the `--source-file-path` CLI option to combine data from multiple re Run the following command from within the codespace terminal: ```bash -gh valet forecast --source-file-path tmp/**/jobs/*.json -o tmp/combined-forecast +gh valet forecast --source-file-path tmp/**/jobs/*.json --output-dir tmp/combined-forecast ``` You can now inspect the output of the command to see a forecast report using all of the files matching the `tmp/**/jobs/*.json` pattern. diff --git a/jenkins/3-dry-run.md b/jenkins/3-dry-run.md index 4706216..19f5145 100644 --- a/jenkins/3-dry-run.md +++ b/jenkins/3-dry-run.md @@ -27,7 +27,7 @@ You will be performing a dry run against a pipeline in your preconfigured Jenkin 2. Run the following command from the root directory: ```bash - gh valet dry-run jenkins --source-url http://localhost:8080/job/test_pipeline -o .tmp/jenkins/dry-run + gh valet dry-run jenkins --source-url http://localhost:8080/job/test_pipeline --output-dir .tmp/jenkins/dry-run ``` 3. The command will list all the files written to disk when the command succeeds. diff --git a/jenkins/4-custom-transformers.md b/jenkins/4-custom-transformers.md index dfcbd52..e345308 100644 --- a/jenkins/4-custom-transformers.md +++ b/jenkins/4-custom-transformers.md @@ -18,7 +18,7 @@ In this lab you will build upon the `dry-run` command to override Valet's defaul You will be performing a `dry-run` command to inspect the workflow that is converted by default. Run the following command within the codespace terminal: ```bash -gh valet dry-run jenkins --source-url http://localhost:8080/job/test_pipeline -o tmp/jenkins/dry-run +gh valet dry-run jenkins --source-url http://localhost:8080/job/test_pipeline --output-dir tmp/jenkins/dry-run ``` The converted workflow that is generated by the above command can be seen below: @@ -114,7 +114,7 @@ This method can use any valid ruby syntax and should return a `Hash` that repres Now you can perform another `dry-run` command and use the `--custom-transformers` CLI option to provide this custom transformer. Run the following command within your codespace terminal: ```bash -gh valet dry-run jenkins --source-url http://localhost:8080/job/test_pipeline -o tmp/jenkins/dry-run --custom-transformers transformers.rb +gh valet dry-run jenkins --source-url http://localhost:8080/job/test_pipeline --output-dir tmp/jenkins/dry-run --custom-transformers transformers.rb ``` Open the workflow that is generated and inspect the contents. Now the `sleep` step is converted and uses the customized behavior! diff --git a/jenkins/6-forecast.md b/jenkins/6-forecast.md index 8506a23..a6fca52 100644 --- a/jenkins/6-forecast.md +++ b/jenkins/6-forecast.md @@ -94,11 +94,11 @@ You can use the `--source-file-path` CLI option to combine data from multiple re Run the following command from within the codespace terminal: ```bash -gh valet forecast --source-file-path tmp/**/jobs/*.json -o tmp/combined-forecast +gh valet forecast --source-file-path tmp/**/jobs/*.json --output-dir tmp/combined-forecast ``` You can now inspect the output of the command to see a forecast report using all of the files matching the `tmp/**/jobs/*.json` pattern. ## Next steps -This concludes all labs for migrating Jenkins pipelines to Actions with Valet! \ No newline at end of file +This concludes all labs for migrating Jenkins pipelines to Actions with Valet!