home

commit e5ea1e5039db8d2d6d2d21acf9e320eb07acd909
parent 088f15080e7c3f4db1362368b0c6961a3e09866b
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Tue, 26 Apr 2022 17:17:05 +0200

users/vincent: update src's mrconfig

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

Diffstat:
M
users/vincent/dev/mr.nix
 | 
2
+-
D
users/vincent/dev/mr/src.osp.forks.mr
 | 
28
----------------------------
M
users/vincent/dev/mr/src.osp.mr
 | 
13
++++++++-----
M
users/vincent/dev/mr/src.osp.p12n.mr
 | 
13
+++++++++++--
M
users/vincent/dev/mr/src.tektoncd.mr
 | 
3
+++

5 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/users/vincent/dev/mr.nix b/users/vincent/dev/mr.nix
@@ -7,7 +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/forks/.mrconfig".source = ./mr/src.osp.forks.mr;
+  # home.file."src/osp/forks/.mrconfig".source = ./mr/src.osp.forks.mr;
   home.file."src/osp/p12n/.mrconfig".source = ./mr/src.osp.p12n.mr;
   home.file."src/osp/.mrconfig".source = ./mr/src.osp.mr;
   # Old setup, migrate this slowly
diff --git a/users/vincent/dev/mr/src.osp.forks.mr b/users/vincent/dev/mr/src.osp.forks.mr
@@ -1,28 +0,0 @@
-# -*- mode: sh -*-
-include = cat ${HOME}/.config/mr
-
-[DEFAULT]
-lib =
-    git_fork_clone() {
-        REPO_NAME=${MR_REPO//$(dirname ${MR_CONFIG})\/}
-        URL=git@github.com:vdemeester/tektoncd-${REPO_NAME}.git
-        UPSTREAM_URL=https://github.com/tektoncd/${REPO_NAME}.git
-        # FIXME(vdemeester) should probably be https
-        OPENSHIFT_URL=git@github.com:openshift/tektoncd-${REPO_NAME}.git
-        echo "URL         : $URL"
-        echo "UPSTREAM_URL: $UPSTREAM_URL"
-        echo "OPENSHIFT_URL: $OPENSHIFT_URL"
-        git clone $URL $MR_REPO
-        cd $MR_REPO
-        git remote add upstream $UPSTREAM_URL
-        git remote add openshift $OPENSHIFT_URL
-        git fetch -p --all
-    }
-checkout = git_fork_clone
-# Do not try to rebase, …
-git_u = git fetch -p --all
-
-[catalog]
-[operator]
-[pipeline]
-[triggers]
diff --git a/users/vincent/dev/mr/src.osp.mr b/users/vincent/dev/mr/src.osp.mr
@@ -6,11 +6,6 @@ lib =
     export BASE_USER=vdemeester
     export BASE_HOST="github.com"
 
-# tektoncd openshift forks (for carrying patches, …)
-[forks]
-chain = true
-skip = true
-
 # downstream (RH internal)
 [p12n]
 chain = true
@@ -18,6 +13,7 @@ skip = true
 
 # github.com/openshift
 [openshift-ci]
+skip = true
 lib =
     export DEFAULT_BRANCH=master
 checkout =
@@ -30,13 +26,16 @@ checkout =
 lib =
     export BASE_PATH=openshift
     export DEFAULT_BRANCH=master
+
 [pipelines-tutorial]
 lib =
     export BASE_PATH=openshift
     export DEFAULT_BRANCH=master
+
 [must-gather]
 lib =
     export BASE_PATH=openshift-pipelines
+
 [toolbox]
 lib =
     export BASE_PATH=openshift-pipelines
@@ -61,3 +60,7 @@ lib =
 [cluster-tasks-tests]
 lib =
     export BASE_PATH=ppitonak
+
+[tekton-task-group]
+lib =
+    export BASE_PATH=openshift-pipelines
diff --git a/users/vincent/dev/mr/src.osp.p12n.mr b/users/vincent/dev/mr/src.osp.p12n.mr
@@ -8,6 +8,15 @@ checkout =
     git remote rename origin gerrit
 u = git fetch -p --all
 
+[p12n]
+checkout =
+    git clone git@gitlab.cee.redhat.com:vdemeest/p12n.git p12n
+    cd p12n
+    git config http.sslVerify false
+    git remote add upstream https://gitlab.cee.redhat.com/tekton/p12n
+    git fetch -p --all
+u = git fetch -p --all
+
 [plumbing]
 checkout =
     git clone git@gitlab.cee.redhat.com:vdemeest/tekton-plumbing.git plumbing
@@ -28,7 +37,7 @@ u = git fetch -p --all
 
 [cpaas-config]
 checkout =
-    git clone git@gitlab.cee.redhat.com:vdemeest/cpaas-products-openshift-pipelines.git cpaas-config
+    git clone git@gitlab.cee.redhat.com:vdemeest/openshift-pipelines.git cpaas-config
     cd cpaas-config
     git config http.sslVerify false
     git remote add upstream https://gitlab.cee.redhat.com/cpaas-products/openshift-pipelines.git
@@ -37,7 +46,7 @@ u = git fetch -p --all
 
 [cpaas-product-configs]
 checkout =
-    git clone git@gitlab.cee.redhat.com:vdemeest/cpaas-products-product-configs.git cpaas-product-configs
+    git clone git@gitlab.cee.redhat.com:vdemeest/product-configs.git cpaas-product-configs
     cd cpaas-product-configs
     git config http.sslVerify false
     git remote add upstream https://gitlab.cee.redhat.com/cpaas-products/product-configs.git
diff --git a/users/vincent/dev/mr/src.tektoncd.mr b/users/vincent/dev/mr/src.tektoncd.mr
@@ -23,3 +23,6 @@ lib =
 [results]
 [triggers]
 [website]
+
+[buildkit-tekton]
+checkout = git clone git@github.com:vdemeester/buildkit-tekton.git