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

Change the way "inherited" workspaces retrieve the base workspace code #4190

Merged
merged 11 commits into from
Dec 23, 2024

Conversation

jonnyry
Copy link
Collaborator

@jonnyry jonnyry commented Dec 11, 2024

Resolves #4162

What is being addressed

Change the way inherited workspaces retrieve the base workspace code - see solution description in #4162

Notes

1. Currently requires the 'canary' release of porter. Ideally this should be a pinned version, however we are waiting for a new version release which includes the --build-context parameter.
(Now resolved - Porter have release version v1.2.1 incorporating the change.)

@jonnyry jonnyry requested a review from marrobi December 11, 2024 17:27
Copy link

github-actions bot commented Dec 11, 2024

Unit Test Results

0 tests   0 ✅  0s ⏱️
0 suites  0 💤
0 files    0 ❌

Results for commit 177c97d.

♻️ This comment has been updated with latest results.

@tim-p-allen
Copy link
Collaborator

tim-p-allen commented Dec 12, 2024

so do you need to have built base first? Will it just use the latest version of base?

@jonnyry
Copy link
Collaborator Author

jonnyry commented Dec 12, 2024

so do you need to have built base first? Will it just use the latest version of base?

you don't need to have base built first, it pulls the latest files from the ../base directory, by using the 'base' --build-context passed to porter build.

@tim-p-allen
Copy link
Collaborator

so do you need to have built base first? Will it just use the latest version of base?

you don't need to have base built first, it pulls the latest files from the ../base directory, by using the 'base' --build-context passed to porter build.

Ahh got you. Nice. Happy to approve will test later

@tim-p-allen
Copy link
Collaborator

/test f6255a6

Copy link

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/12306981977 (with refid bc30f232)

(in response to this comment from @tim-allen-ck)

@tim-p-allen
Copy link
Collaborator

@jonnyry
Copy link
Collaborator Author

jonnyry commented Dec 13, 2024

@jonnyry https://github.com/microsoft/AzureTRE/actions/runs/12306981977/job/34350005999#step:3:1

Ah let me take a look.

@jonnyry
Copy link
Collaborator Author

jonnyry commented Dec 13, 2024

/test 8475e2a

Copy link

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/12314479660 (with refid bc30f232)

(in response to this comment from @jonnyry)

@jonnyry
Copy link
Collaborator Author

jonnyry commented Dec 13, 2024

/test 43d4a60

Copy link

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/12314638144 (with refid bc30f232)

(in response to this comment from @jonnyry)

@jonnyry
Copy link
Collaborator Author

jonnyry commented Dec 13, 2024

Made a change so that the porter build --build-context parameter is only used when required, i.e. for the following workspaces:

  • airlock-import-review
  • unrestricted

In all other cases, the --build-context parameter is not used.

The bundle-build make target does this by looking for a file named porter-build-context.env in the workspace folder, if it exists, it grabs the additional build context from the file and passes it to porter build, else it runs porter build without the parameter.

jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 14, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 14, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 14, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 15, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 15, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 16, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 16, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 16, 2024
@jonnyry
Copy link
Collaborator Author

jonnyry commented Dec 18, 2024

@jonnyry think we need to wait for a new Porter release for this? Not sure running on canary is wise given it could "update" at any time.

Yes indeed. I have requested a patch release, though I don't think its quite as quick and simple as a release of the mixins - they are discussing and will get back to me.

jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 18, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 18, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 19, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 20, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 21, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 21, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 21, 2024
jonnyry added a commit to nwsde/nwsde-azuretre that referenced this pull request Dec 21, 2024
@jonnyry
Copy link
Collaborator Author

jonnyry commented Dec 22, 2024

Porter have released version v1.2.1 incorporating the change. https://github.com/getporter/porter/releases/tag/v1.2.1

@jonnyry
Copy link
Collaborator Author

jonnyry commented Dec 22, 2024

/test 184b000

Copy link

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/12458499867 (with refid bc30f232)

(in response to this comment from @jonnyry)

@jonnyry jonnyry removed the blocked Cannot progress at present label Dec 23, 2024
@jonnyry
Copy link
Collaborator Author

jonnyry commented Dec 23, 2024

/test-destroy-env

Copy link

Destroying PR test environment (RG: rg-trebc30f232)... (run: https://github.com/microsoft/AzureTRE/actions/runs/12463669373)

Copy link

PR test environment destroy complete (RG: rg-trebc30f232)

@jonnyry
Copy link
Collaborator Author

jonnyry commented Dec 23, 2024

/test 184b000

Copy link

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/12464141375 (with refid bc30f232)

(in response to this comment from @jonnyry)

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.

As long as tested to work, looks great. Thanks again!

@jonnyry jonnyry enabled auto-merge (squash) December 23, 2024 18:22
@jonnyry
Copy link
Collaborator Author

jonnyry commented Dec 23, 2024

/test 177c97d

Copy link

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/12471249205 (with refid bc30f232)

(in response to this comment from @jonnyry)

@jonnyry jonnyry merged commit ea0a998 into microsoft:main Dec 23, 2024
12 checks passed
@jonnyry jonnyry deleted the jr/upstream-main/77-porter-build-context branch December 23, 2024 19:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change the way "inherited" workspaces retrieve the base workspace code
3 participants