cmdlib: mount src/config-git into supermin instead of src/config if present#2936
Closed
jlebon wants to merge 3 commits intocoreos:mainfrom
Closed
cmdlib: mount src/config-git into supermin instead of src/config if present#2936jlebon wants to merge 3 commits intocoreos:mainfrom
src/config-git into supermin instead of src/config if present#2936jlebon wants to merge 3 commits intocoreos:mainfrom
Conversation
We want to retain a symlink to the top-level dir itself.
Prep for future patch.
While we're here, drop `-r`. We want `src/config` to always be exactly a
symlink to `config-git/${subdir}`.
This was referenced Jun 20, 2022
In those situations, it's expected that `src/config` is a relative symlink to a subdir in `src/config-git`.
…if present The real repo is in `src/config-git` in a subdir setup and `src/config` is just a relative symlink to the subdir in question. This should allow us to use subdirs in the CI of openshift/os for different RHEL/CentOS versions. Long-term, we should probably move away from subdirs into something more structured that doesn't require symlinking everything into the subdirs.
Member
Author
|
I tested this with FCOS locally using: diff --git a/mysubdir/fedora.repo b/mysubdir/fedora.repo
new file mode 120000
index 00000000..6e70b00b
--- /dev/null
+++ b/mysubdir/fedora.repo
@@ -0,0 +1 @@
+../fedora.repo
\ No newline at end of file
diff --git a/mysubdir/image-base.yaml b/mysubdir/image-base.yaml
new file mode 120000
index 00000000..c6c81978
--- /dev/null
+++ b/mysubdir/image-base.yaml
@@ -0,0 +1 @@
+../image-base.yaml
\ No newline at end of file
diff --git a/mysubdir/image.yaml b/mysubdir/image.yaml
new file mode 120000
index 00000000..73c5b031
--- /dev/null
+++ b/mysubdir/image.yaml
@@ -0,0 +1 @@
+../image.yaml
\ No newline at end of file
diff --git a/mysubdir/live b/mysubdir/live
deleted file mode 120000
index e69de29b..00000000
diff --git a/mysubdir/manifest.yaml b/mysubdir/manifest.yaml
new file mode 100644
index 00000000..a89f57e2
--- /dev/null
+++ b/mysubdir/manifest.yaml
@@ -0,0 +1 @@
+include: ../manifest.yaml
diff --git a/mysubdir/overlay.d b/mysubdir/overlay.d
new file mode 120000
index 00000000..bdc0a4ca
--- /dev/null
+++ b/mysubdir/overlay.d
@@ -0,0 +1 @@
+../overlay.d
\ No newline at end of file
diff --git a/mysubdir/tests b/mysubdir/tests
deleted file mode 120000
index e69de29b..00000000And then: |
Merged
Member
Author
|
Closing in favour of #2934. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The real repo is in
src/config-gitin a subdir setup andsrc/configis just a relative symlink to the subdir in question.
This should allow us to use subdirs in the CI of openshift/os for
different RHEL/CentOS versions.
Long-term, we should probably move away from subdirs into something more
structured that doesn't require symlinking everything into the subdirs.