Skip to content
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

Import reviewer VM #2636

Conversation

JaimieWi
Copy link
Contributor

Resolves #2601

What is being addressed

A new user resource template (Guacamole VM) is required to review import data requests.

How is this addressed

  • The user resource template is based on the Windows VM template, therefore this was copied across initially.
  • Changes were made to the template schema to allow only a Windows 10 image and two smaller VM sizes given as options.
  • As the user resource is based on the windows terraform files:
  • The contents of the terraform directory were removed and replaced with an empty text file
  • Within Dockerfile.tmpl the lines below were added to copy the terraform configuration from the OSS repo:
ARG AZURE_TRE_VERSION="0.4.3"

RUN  apt-get update \
  && apt-get install --no-install-recommends jq ca-certificates curl -y \
  && apt-get clean -y && rm -rf /var/lib/apt/lists/*

WORKDIR $BUNDLE_DIR

RUN  curl -o azuretre.tar.gz -L "https://github.com/microsoft/AzureTRE/archive/refs/tags/v${AZURE_TRE_VERSION}.tar.gz" \
  && tar -xzf azuretre.tar.gz "AzureTRE-${AZURE_TRE_VERSION}/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm"  --strip-components=6 --skip-old-files \
  && rm -rf azuretre.tar.gz

  • This has been tested by running make bundle-build bundle-publish bundle-register and creating a VM from the template.

@github-actions github-actions bot added the external PR from an external contributor label Sep 22, 2022
@tanya-borisova
Copy link
Contributor

/test

@github-actions
Copy link

🤖 pr-bot 🤖

⚠️ When using /test on external PRs, the SHA of the checked commit must be specified

(in response to this comment from @tanya-borisova)

@github-actions
Copy link

github-actions bot commented Sep 23, 2022

Unit Test Results

0 tests   0 ✔️  0s ⏱️
0 suites  0 💤
0 files    0

Results for commit 9f76504.

♻️ This comment has been updated with latest results.

@tanya-borisova
Copy link
Contributor

/test 618f5fe

@github-actions
Copy link

🤖 pr-bot 🤖

⚠️ The specified SHA 618f5fe1efcfad3bfdc6b8245f30e8b30a8e5e81 is not the latest commit on the PR. Please validate the latest commit and re-run /test

(in response to this comment from @tanya-borisova)

@tanya-borisova
Copy link
Contributor

/test eb4606d

@github-actions
Copy link

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/3113305495 (with refid 7fc0d836)

(in response to this comment from @tanya-borisova)

@tanya-borisova
Copy link
Contributor

/test a8b6ab9

@github-actions
Copy link

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/3127024494 (with refid 7fc0d836)

(in response to this comment from @tanya-borisova)

Copy link
Member

@marrobi marrobi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think it's almost there, couple of comments re shared storage, if it's always going to be false, lets set it that way.

Copy link
Member

@marrobi marrobi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. @tanya-borisova can you create an issue and assign to yourself to update the .diff when it can be? Thanks.

@tanya-borisova
Copy link
Contributor

/test-force-approve

@github-actions
Copy link

🤖 pr-bot 🤖

✅ Marking tests as complete (for commit 9f76504)

(in response to this comment from @tanya-borisova)

@tanya-borisova
Copy link
Contributor

(Force-approve because this doesn't touch TRE core, just adding a new template)

@tanya-borisova tanya-borisova merged commit 9dc7b55 into microsoft:main Sep 26, 2022
@JaimieWi JaimieWi deleted the JaimieWi/2601-reviewer_user_resource_template branch September 27, 2022 08:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
external PR from an external contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

User resource template for Import Review VM
3 participants