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

fix: Pipeline agent image update from 18.04 to 22.04 | AzSecPack #2327

Merged
merged 7 commits into from
Oct 26, 2023

Conversation

jpayne3506
Copy link
Contributor

@jpayne3506 jpayne3506 commented Oct 26, 2023

Reason for Change:

This PR is the first to migrate our agent pool to a 1ES maintained agent pool. This is primarily to unblock the ACN PR pipeline and will be improved upon.

Future CI:

  • Check for systemd-resolved not tied to ubuntu image version
  • Properly assign *auth.json to skopeo commands
  • Remove reinstalling dependencies from JIT provisioning script
  • Remove all uses of sudo where applicable

Issue Fixed:

Requirements:

Notes:

@jpayne3506 jpayne3506 requested a review from a team as a code owner October 26, 2023 16:25
@jpayne3506 jpayne3506 self-assigned this Oct 26, 2023
@jpayne3506 jpayne3506 requested a review from ecigar13 October 26, 2023 16:25
@jpayne3506 jpayne3506 changed the title fix: Pipeline image update from 18.04 to 22.04: AzSecPack fix: Pipeline agent image update from 18.04 to 22.04: AzSecPack Oct 26, 2023
@jpayne3506 jpayne3506 changed the title fix: Pipeline agent image update from 18.04 to 22.04: AzSecPack fix: Pipeline agent image update from 18.04 to 22.04 | AzSecPack Oct 26, 2023
@jpayne3506 jpayne3506 force-pushed the jpayne3506/update-network-linux-test branch from ab02fd2 to 54fb0b3 Compare October 26, 2023 16:29
estebancams
estebancams previously approved these changes Oct 26, 2023
@jpayne3506
Copy link
Contributor Author

jpayne3506 commented Oct 26, 2023

Will integrate changes from #1985 which #2320 (comment) mentions in the matching closed PR in a future PR to fix the Check for systemd-resolved not tied to ubuntu image version CI

Copy link
Contributor

@sheylatrudo sheylatrudo left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@@ -499,7 +499,7 @@ manifest-push: # util target to push multiarch container manifest.
$(CONTAINER_BUILDER) manifest push --all $(IMAGE_REGISTRY)/$(IMAGE):$(TAG) docker://$(IMAGE_REGISTRY)/$(IMAGE):$(TAG)

manifest-skopeo-archive: # util target to export tar archive of multiarch container manifest.
skopeo copy --all docker://$(IMAGE_REGISTRY)/$(IMAGE):$(TAG) oci-archive:$(IMAGE_ARCHIVE_DIR)/$(IMAGE)-$(TAG).tar
skopeo copy --all docker://$(IMAGE_REGISTRY)/$(IMAGE):$(TAG) oci-archive:$(IMAGE_ARCHIVE_DIR)/$(IMAGE)-$(TAG).tar --debug
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to keep this as debug?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I believe we should as it provides good understanding of what is happening with the *auth.json files IRT skopeo. Future changes to skopeo could break the current hack and future CI changes of this command.


echo "setting XDG_RUNTIME_DIR"
export XDG_RUNTIME_DIR=/run/user/$(id -u)
echo $XDG_RUNTIME_DIR
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to set this in the task or set this as an env var from the pipeline level?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If we set this as an env var in the pipeline then it impacts podman and buildah negatively. This hack is exclusive to skopeo.

@jpayne3506 jpayne3506 added fix Fixes something. needs-backport Change needs to be backported to previous release trains labels Oct 26, 2023
@rbtr rbtr enabled auto-merge (squash) October 26, 2023 20:34
@rbtr rbtr disabled auto-merge October 26, 2023 22:54
@rbtr rbtr merged commit 29502bc into master Oct 26, 2023
59 of 76 checks passed
@rbtr rbtr deleted the jpayne3506/update-network-linux-test branch October 26, 2023 22:54
jpayne3506 added a commit that referenced this pull request Nov 3, 2023
* Use ResolveCtl for Ubuntu22.04

* test: debug

* test: XDG dir

* ci: Remove sudo for testvalidate

* ci: remove sudo dualstack

* ci: remove test scripts

* fix: lint

---------

Co-authored-by: Sheyla Trudo <[email protected]>
rbtr pushed a commit that referenced this pull request Nov 3, 2023
…#2327) to release/v1.4 (#2353)

fix: Pipeline agent image update from 18.04 to 22.04 | AzSecPack (#2327)

* Use ResolveCtl for Ubuntu22.04

* test: debug

* test: XDG dir

* ci: Remove sudo for testvalidate

* ci: remove sudo dualstack

* ci: remove test scripts

* fix: lint

---------

Co-authored-by: Sheyla Trudo <[email protected]>
@rbtr rbtr removed the needs-backport Change needs to be backported to previous release trains label Dec 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix Fixes something.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants