home

commit 9beef75ab3672735128ccd0baf464854cbec7f04
parent 262f13b4eb8fbb7bec6782fa054817b271811354
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Wed, 15 Sep 2021 16:29:34 +0200

users/vincent: rework =mr= a bit

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
users/vincent/dev/mr.nix
 | 
5
++---
D
users/vincent/dev/mr/src.github.openshift-pipelines.mr
 | 
11
-----------
D
users/vincent/dev/mr/src.github.openshift.mr
 | 
13
-------------
M
users/vincent/dev/mr/src.go.sbr.pm.mr
 | 
1
+
M
users/vincent/dev/mr/src.k8s.io.mr
 | 
1
+
M
users/vincent/dev/mr/src.knative.dev.mr
 | 
1
+
M
users/vincent/dev/mr/src.mr
 | 
16
+++++++++++-----
A
users/vincent/dev/mr/src.osp.mr
 | 
2
++
D
users/vincent/dev/mr/src.pkgs.devel.redhat.mr
 | 
32
--------------------------------

9 files changed, 18 insertions(+), 64 deletions(-)
diff --git a/users/vincent/dev/mr.nix b/users/vincent/dev/mr.nix
@@ -7,8 +7,7 @@
   home.file."src/go.sbr.pm/.mrconfig".source = ./mr/src.go.sbr.pm.mr;
   home.file."src/k8s.io/.mrconfig".source = ./mr/src.k8s.io.mr;
   home.file."src/knative.dev/.mrconfig".source = ./mr/src.knative.dev.mr;
+  home.file."src/osp/.mrconfig".source = ./mr/src.osp.mr;
+  # Old setup, migrate this slowly
   home.file."src/github.com/.mrconfig".source = ./mr/src.github.mr;
-  home.file."src/github.com/openshift/.mrconfig".source = ./mr/src.github.openshift.mr;
-  home.file."src/github.com/openshift-pipelines/.mrconfig".source = ./mr/src.github.openshift-pipelines.mr;
-  home.file."src/pkgs.devel.redhat.com/.mrconfig".source = ./mr/src.pkgs.devel.redhat.mr;
 }
diff --git a/users/vincent/dev/mr/src.github.openshift-pipelines.mr b/users/vincent/dev/mr/src.github.openshift-pipelines.mr
@@ -1,11 +0,0 @@
-# -*- mode: sh -*-
-include = cat ${HOME}/.config/mr
-
-[DEFAULT]
-lib =
-    export BASE_PATH=openshift-pipelines
-    export BASE_USER=vdemeester
-    export BASE_HOST="github.com"
-
-[knowledge-base]
-[release-tests]
diff --git a/users/vincent/dev/mr/src.github.openshift.mr b/users/vincent/dev/mr/src.github.openshift.mr
@@ -1,13 +0,0 @@
-# -*- mode: sh -*-
-include = cat ${HOME}/.config/mr
-
-[DEFAULT]
-lib =
-    export BASE_PATH=openshift
-    export BASE_USER=vdemeester
-    export BASE_HOST="github.com"
-
-[pipelines-catalog]
-[pipelines-docs]
-[pipelines-tutorial]
-[release]
diff --git a/users/vincent/dev/mr/src.go.sbr.pm.mr b/users/vincent/dev/mr/src.go.sbr.pm.mr
@@ -1,3 +1,4 @@
+# -*- mode: sh -*-
 include = cat ${HOME}/.config/mr
 
 [ape]
diff --git a/users/vincent/dev/mr/src.k8s.io.mr b/users/vincent/dev/mr/src.k8s.io.mr
@@ -1,3 +1,4 @@
+# -*- mode: sh -*-
 include = cat ${HOME}/.config/mr
 
 [DEFAULT]
diff --git a/users/vincent/dev/mr/src.knative.dev.mr b/users/vincent/dev/mr/src.knative.dev.mr
@@ -1,3 +1,4 @@
+# -*- mode: sh -*-
 include = cat ${HOME}/.config/mr
 
 [DEFAULT]
diff --git a/users/vincent/dev/mr/src.mr b/users/vincent/dev/mr/src.mr
@@ -1,21 +1,27 @@
+# -*- mode: sh -*-
 include = cat ${HOME}/.config/mr
 
-[github.com]
+[osp]
 chain = true
 skip = true
 
-[gitlab.com]
+[tektoncd]
 chain = true
 skip = true
 
-[git.sr.ht]
+[knative.dev]
 chain = true
 skip = true
 
-[knative.dev]
+[k8s.io]
 chain = true
 skip = true
 
-[pkgs.devel.redhat.com]
+# Old ones
+[github.com]
+chain = true
+skip = true
+
+[gitlab.com]
 chain = true
 skip = true
diff --git a/users/vincent/dev/mr/src.osp.mr b/users/vincent/dev/mr/src.osp.mr
@@ -0,0 +1,2 @@
+# -*- mode: sh -*-
+include = cat ${HOME}/.config/mr
diff --git a/users/vincent/dev/mr/src.pkgs.devel.redhat.mr b/users/vincent/dev/mr/src.pkgs.devel.redhat.mr
@@ -1,31 +0,0 @@
-include = cat ${HOME}/.config/mr
-
-[DEFAULT]
-lib =
-    export BASE_HOST="pkgs.devel.redhat.com"
-    export GIT_PREFIX="ssh://"
-    export GIT_USERNAME=vdemeest
-
-[containers/openshift-pipelines-bash]
-[containers/openshift-pipelines-catalog-buildah]
-[containers/openshift-pipelines-catalog-oc]
-[containers/openshift-pipelines-controller]
-[containers/openshift-pipelines-creds-init]
-[containers/openshift-pipelines-entrypoint]
-[containers/openshift-pipelines-gcs-fetcher]
-[containers/openshift-pipelines-git-init]
-[containers/openshift-pipelines-gsutil]
-[containers/openshift-pipelines-imagedigestexporter]
-[containers/openshift-pipelines-kubeconfigwriter]
-[containers/openshift-pipelines-nop]
-[containers/openshift-pipelines-operator]
-[containers/openshift-pipelines-operator-dev-operator-metadata]
-[containers/openshift-pipelines-operator-prod-operator-metadata]
-[containers/openshift-pipelines-operator-stage-operator-metadata]
-[containers/openshift-pipelines-pullrequest-init]
-[containers/openshift-pipelines-triggers-controller]
-[containers/openshift-pipelines-triggers-eventlistenersink]
-[containers/openshift-pipelines-triggers-webhook]
-[containers/openshift-pipelines-webhook]
-
-[rpms/tektoncd-cli]-
\ No newline at end of file