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

infra: Migrate Repositories #201

Merged
merged 146 commits into from
May 8, 2024
Merged

infra: Migrate Repositories #201

merged 146 commits into from
May 8, 2024

Conversation

lorenzleutgeb
Copy link
Member

@lorenzleutgeb lorenzleutgeb commented Apr 26, 2024

Towards #200:

  • Add /CODOWNERS, making @Erethon, @fricklerhandwerk, @Janik-Haag and me owners of /infra.
  • Merge the following two repositories into /infra, while preserving their history. Both repositories should be archived as soon as this PR is merged.
  • Remove most of the configuration of the "makemake" machine, in particular everything related to Hydra.
  • Start over with a new configuration.

I have deployed the new machine to a VM, it boots and is happy.

Since the PR diff doesn't really show what changes I made relative to the two previous infra repositories, here's a more precise one: git diff d7d230f..infra -- infra

@Erethon: Happy to have your review. If you want, we can also set up a call and I walk you through.

@Ericson2314: Once this is deployed, which could be any time without further notice, hydra.ngi0.nixos.org will be gone for good. Are you still using it in anyway?

⚠️ Please don't squash merge this. I'd really like to keep the history of the NixOS/infra repo.

edolstra and others added 30 commits July 25, 2014 15:20
Closes #43.
Channel redirects are now stored in S3.

Fixes #72.
Fixes #73.
…s issue tracker with the 'infrastructure' label.
to be able to rsync nixos.org/releases to release.nixos.org
requesting (garbas) access to nixos.org server
Flake input changes:

* Added 'nixpkgs': 'github:edolstra/nixpkgs/581caef4f5d58573c96ab6e9dbf1160209372029'
Flake input changes:

* Updated 'hydra': 'github:NixOS/hydra/be8eb9d00d6a3fcac520bc7dfd5740c0b3ade746' -> 'github:NixOS/hydra/87837f1d82904bf48e11b5641258b6be2f663c3b'
* Updated 'hydra/nix': 'github:NixOS/nix/4ad5826a182f8eeb4cbc61e27d2128b08050b0d4' -> 'github:NixOS/nix/3aaceeb7e2d3fb8a07a1aa5a21df1dca6bbaa0ef'
* Updated 'hydra/nix/nixpkgs': 'github:edolstra/nixpkgs/43e283790fbe330b723ac44b584824cf6d85c1ee' -> 'github:NixOS/nixpkgs/b88ff468e9850410070d4e0ccd68c7011f15b2be'
* Updated 'hydra/nixpkgs': 'github:edolstra/nixpkgs/d959778e0934c4c93896d509a65de798909c7cdd' -> 'github:NixOS/nixpkgs/29eddfc36d720dcc4822581175217543b387b1e8'
* Updated 'nix': 'github:NixOS/nix/4a4521f46253e87a06af9333381c050e983b3c2f' -> 'github:NixOS/nix/6521c92ce8289a5f9e959c6789ab24dacdad082e'
* Updated 'nix/nixpkgs': 'github:edolstra/nixpkgs/43e283790fbe330b723ac44b584824cf6d85c1ee' -> 'github:NixOS/nixpkgs/b88ff468e9850410070d4e0ccd68c7011f15b2be'
* Updated 'nixpkgs': 'github:edolstra/nixpkgs/581caef4f5d58573c96ab6e9dbf1160209372029' -> 'github:NixOS/nixpkgs/2faa76db27c4a8045d050d9b390dbb2249b0f3c0'
Flake input changes:

* Updated 'hydra': 'github:NixOS/hydra/87837f1d82904bf48e11b5641258b6be2f663c3b' -> 'github:NixOS/hydra/3c6b724f921132b06a16d933d5f215788f88d0e1'
* Updated 'hydra/nix': 'github:NixOS/nix/3aaceeb7e2d3fb8a07a1aa5a21df1dca6bbaa0ef' -> 'github:NixOS/nix/14a3a62bfca6c572b9a415cfa80cdbd7ad4326b3'
* Updated 'nix': 'github:NixOS/nix/6521c92ce8289a5f9e959c6789ab24dacdad082e' -> 'github:NixOS/nix/5f64655ff429be08aa0787761697787e7050f373'
* Updated 'nixpkgs': 'github:NixOS/nixpkgs/2faa76db27c4a8045d050d9b390dbb2249b0f3c0' -> 'github:NixOS/nixpkgs/f45ccd9d20b4e90e43c4562b9941ea1dbd8f07a4'
infra/ssh-keys.nix Outdated Show resolved Hide resolved
lorenzleutgeb and others added 9 commits May 4, 2024 01:43
Instead of using Hydra's Nix, Nixpkgs, overlays, etc. Use stock
`nixpkgs-unstable`. Hydra's module and the package itself is taken from
the hydra repo (so we are still testing bleeding edge `hydra/nix-next`),
but everything else (including the ambient Nix daemon) is stock.

This will get Hydra testing "out of the way" as the Nix NGI project
switches to using buildbot instead.
… not depending on `network-online.target`
flake.lock Show resolved Hide resolved
Copy link
Collaborator

@Erethon Erethon left a comment

Choose a reason for hiding this comment

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

Some of the Nix/flake specific parts go over my head, but the makemake configuration makes sense and LGTM. Again, not sure about the Hydra setup but it seems reasonable. I think we can merge this since it's a big PR and continue from here with incremental improvements as (if?) we run any issues/diffs.

@lorenzleutgeb lorenzleutgeb merged commit a2e27d6 into main May 8, 2024
9 checks passed
@lorenzleutgeb lorenzleutgeb deleted the infra branch May 8, 2024 22:58
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.