diff --git a/bamboo/1-configure.md b/bamboo/1-configure.md index 0175f1c..774a75a 100644 --- a/bamboo/1-configure.md +++ b/bamboo/1-configure.md @@ -17,13 +17,15 @@ You will need to complete all of the [setup instructions](./readme.md#configure- - Click `Generate token`. - Copy the generated PAT and save it in a safe location. +2. Create a Bamboo personal access token using the Bamboo [documentation](https://confluence.atlassian.com/bamboo/personal-access-tokens-976779873.html). This step is optional since we are using local files throughout the labs and a random value can be used instead. + 2. Run the `configure` CLI command: - Select the `TERMINAL` tab from within the codespace terminal. - Run the following command: `gh actions-importer configure`. - Use the down arrow key to highlight `Bamboo`, press the spacebar to select, and then press enter to continue. - - At the GitHub PAT prompt, enter the GitHub PAT generated in step 2 and press enter. + - At the GitHub PAT prompt, enter the GitHub PAT generated in step 1 and press enter. - At the GitHub URL prompt, enter the GitHub instance URL or press enter to accept the default value (`https://github.com`). - - At the Bamboo token prompt, enter the access token from step 1 and press enter. + - At the Bamboo token prompt, enter the access token from step 2 and press enter. - At the Bamboo URL prompt, enter your Bamboo Base URL. ## Verify your environment diff --git a/bamboo/5-custom-transformers.md b/bamboo/5-custom-transformers.md index 256b864..d944a97 100644 --- a/bamboo/5-custom-transformers.md +++ b/bamboo/5-custom-transformers.md @@ -76,7 +76,7 @@ Let's answer the following questions before proceeding to write a custom transfo - Upon conducting some research, you've discovered that the [Actions Cache](https://github.com/marketplace/actions/cache) action in the marketplace offer comparable functionality. ```yaml - - uses: actions/cache/save@v3 + - uses: actions/cache@v3 with: path: key: @@ -94,7 +94,7 @@ Let's answer the following questions before proceeding to write a custom transfo transform "any-task/plugin-key/com.atlassian.bamboo.plugins.builder.unknowncache" do |item| [ { - "uses" => "azure/cache/save@v3", + "uses" => "actions/cache@v3", "with" => { "path" => item["configuration"]["path"], "key" => item["configuration"]["key"] @@ -139,7 +139,7 @@ With these questions answered, you can add the following code to the `transforme runner "bamboo-runner", "some-other-runner" ``` -In this example, the first parameter to the `runner` method is the runner label in Bitbucket and the second is the new runner label to use in GitHub Actions. +In this example, the first parameter to the `runner` method is the runner label in Bamboo and the second is the new runner label to use in GitHub Actions. Now you can perform another `dry-run` command with the `--custom-transformers` CLI option. When you open the converted workflow the `runs-on` statement will use the customized runner label: @@ -165,7 +165,7 @@ runner "bamboo-runner", "some-other-runner" transform "any-task/plugin-key/com.atlassian.bamboo.plugins.builder.unknowncache" do |item| [ { - "uses" => "azure/cache/save@v3", + "uses" => "actions/cache@v3", "with" => { "path" => item["configuration"]["path"], "key" => item["configuration"]["key"] diff --git a/bamboo/6-migrate.md b/bamboo/6-migrate.md index b36f044..b2096b6 100644 --- a/bamboo/6-migrate.md +++ b/bamboo/6-migrate.md @@ -7,7 +7,7 @@ In this lab, you will use the `migrate` command to convert a Bamboo plan and ope 1. Followed the [steps to set up your GitHub Codespaces](./readme.md#configure-your-codespace) environment. 2. Completed the [configure lab](./1-configure.md#configuring-credentials). -3. Completed the [dry-run lab](./3-dry-run.md). +3. Completed the [dry-run lab](./4-dry-run.md). ## Performing a migration @@ -28,7 +28,7 @@ Answer the following questions before running a `migrate` command: 1. Run the following `migrate` command in your codespace terminal: ```bash - $ gh actions-importer migrate bamboo build --target-url --output-dir tmp/migrate --source-file-path bamboo/bootstrap/source_files/bamboo/bamboo.yml + gh actions-importer migrate bamboo build -p MARS-ROCKET --target-url --output-dir tmp/migrate --source-file-path bamboo/bootstrap/source_files/bamboo/bamboo.yml ``` Note: The `--source-file-path` option is not required and is used throughout this lab to convert files that are stored locally. This can be omitted and GitHub Actions Importer will programmatically fetch pipeline definitions using the Bamboo REST APIs.