fake-master

# These are the necessary commands - below I have run them and include a couple of more
# that showcase the preparation of fake-master.

# Necessary
git clone git@github.com:openshift/ose
cd ose
git remote add upstream https://github.com/openshift/origin
git fetch upstream
git checkout fake-master
git reset --hard upstream/master
git fetch origin pull/553/head:carries
git cherry-pick e1fe7eb
git cherry-pick d3d8513
git cherry-pick 58a8405
git push origin fake-master -f


# Test run of preparing fake-master
[mkargaki@dhcp129-211 ~]$ git clone git@github.com:openshift/ose
Cloning into 'ose'...
remote: Counting objects: 239854, done.
remote: Compressing objects: 100% (278/278), done.
remote: Total 239854 (delta 141), reused 6 (delta 6), pack-reused 239569
Receiving objects: 100% (239854/239854), 275.84 MiB | 9.88 MiB/s, done.
Resolving deltas: 100% (162858/162858), done.
Checking connectivity... done.

[mkargaki@dhcp129-211 ~]$ cd ose/

[mkargaki@dhcp129-211 ose]$ git remote add upstream https://github.com/openshift/origin

[mkargaki@dhcp129-211 ose]$ git remote -v
origin	git@github.com:openshift/ose (fetch)
origin	git@github.com:openshift/ose (push)
upstream	https://github.com/openshift/origin (fetch)
upstream	https://github.com/openshift/origin (push)

[mkargaki@dhcp129-211 ose]$ git fetch upstream
remote: Counting objects: 817, done.
remote: Compressing objects: 100% (38/38), done.
remote: Total 817 (delta 447), reused 438 (delta 432), pack-reused 347
Receiving objects: 100% (817/817), 400.10 KiB | 0 bytes/s, done.
Resolving deltas: 100% (519/519), completed with 297 local objects.
From https://github.com/openshift/origin
 * [new branch]      master     -> upstream/master
 * [new branch]      release-1.2 -> upstream/release-1.2
 * [new branch]      release-1.3 -> upstream/release-1.3
 * [new branch]      release-1.4 -> upstream/release-1.4
 * [new branch]      revert-12727-revert-12684-skuznets/refactor-tito -> upstream/revert-12727-revert-12684-skuznets/refactor-tito
 * [new tag]         v1.3.0     -> v1.3.0
 * [new tag]         v1.3.0-alpha.2 -> v1.3.0-alpha.2
 * [new tag]         v1.3.0-alpha.3 -> v1.3.0-alpha.3
 * [new tag]         v1.3.0-rc1 -> v1.3.0-rc1
 * [new tag]         v1.3.3     -> v1.3.3
 * [new tag]         v1.4.0-alpha.0 -> v1.4.0-alpha.0
 * [new tag]         v1.4.0-alpha.1 -> v1.4.0-alpha.1
 * [new tag]         v1.4.0-rc1 -> v1.4.0-rc1
 * [new tag]         v1.5.0-alpha.0 -> v1.5.0-alpha.0
 * [new tag]         v1.5.0-alpha.1 -> v1.5.0-alpha.1
 * [new tag]         v1.5.0-alpha.2 -> v1.5.0-alpha.2
 * [new tag]         v1.2.1     -> v1.2.1
 * [new tag]         v1.2.2     -> v1.2.2
 * [new tag]         v1.3.1     -> v1.3.1
 * [new tag]         v1.3.2     -> v1.3.2
 * [new tag]         v1.4.0     -> v1.4.0
 * [new tag]         v1.4.1     -> v1.4.1

[mkargaki@dhcp129-211 ose]$ git checkout fake-master
Branch fake-master set up to track remote branch fake-master from origin.
Switched to a new branch 'fake-master'

[mkargaki@dhcp129-211 ose]$ git reset --hard upstream/master
HEAD is now at c84f2c9 Merge pull request #12427 from rootfs/rbd-img

# Now fetch Steve's PR that contains the carries
[mkargaki@dhcp129-211 ose]$ git fetch origin pull/553/head:carries
remote: Counting objects: 25, done.
remote: Total 25 (delta 15), reused 15 (delta 15), pack-reused 10
Unpacking objects: 100% (25/25), done.
From github.com:openshift/ose
 * [new ref]         refs/pull/553/head -> carries

[mkargaki@dhcp129-211 ose]$ git branch
  carries
* fake-master
  master

[mkargaki@dhcp129-211 ose]$ git checkout carries
Switched to branch 'carries'

[mkargaki@dhcp129-211 ose]$ git log --oneline
22bbc1f [DROP] 'oc cluster up' changes
e878e6e [DROP] build wrapper version changes
a113e82 [DROP] backported image manifests from dist-git
58a8405 [CARRY][RELEASE TOOLING] osbs image build scripts
d3d8513 [CARRY][RELEASE TOOLING] tito cache and specfile updates
e1fe7eb [CARRY][BRANDING] add an 'ose' image
435e2b6 [CARRY][BRANDING] platform naming and template updates
c619de9 [CARRY][BRANDING] URL updates
bbe59b3 [CARRY][BRANDING] manpage updates
8e57c4b bump(github.com/openshift/origin-web-console): fa6f2af00717135ec5c8352daf73a3db2a4f4255
4f1c538 Merge pull request #12481 from soltysh/rebase-1.5.2
283a990 Merge pull request #12496 from smarterclayton/lengthen_timeout
d74d19c Increase timeout of deployment test
<- SNIP ->

[mkargaki@dhcp129-211 ose]$ git checkout fake-master
Switched to branch 'fake-master'
Your branch and 'origin/fake-master' have diverged,
and have 30 and 1038 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

[mkargaki@dhcp129-211 ose]$ git cherry-pick e1fe7eb
[fake-master 3107eb0] [CARRY][BRANDING] add an 'ose' image
 Author: Steve Kuznetsov <skuznets@redhat.com>
 Date: Tue Jan 17 13:59:53 2017 -0500
 1 file changed, 1 insertion(+)
 create mode 120000 images/ose

[mkargaki@dhcp129-211 ose]$ git cherry-pick d3d8513
[fake-master 7feec11] [CARRY][RELEASE TOOLING] tito cache and specfile updates
 Author: Steve Kuznetsov <skuznets@redhat.com>
 Date: Tue Jan 17 13:58:37 2017 -0500
 4 files changed, 9003 insertions(+), 6 deletions(-)
 create mode 100644 .tito/packages/atomic-openshift
 delete mode 100644 .tito/packages/origin

[mkargaki@dhcp129-211 ose]$ git cherry-pick 58a8405
[fake-master 991be23] [CARRY][RELEASE TOOLING] osbs image build scripts
 Author: Steve Kuznetsov <skuznets@redhat.com>
 Date: Tue Jan 17 13:59:17 2017 -0500
 2 files changed, 1467 insertions(+)
 create mode 100644 hack/ose.conf
 create mode 100755 hack/ose_images.sh

[mkargaki@dhcp129-211 ose]$ git log --oneline
991be23 [CARRY][RELEASE TOOLING] osbs image build scripts
7feec11 [CARRY][RELEASE TOOLING] tito cache and specfile updates
3107eb0 [CARRY][BRANDING] add an 'ose' image
c84f2c9 Merge pull request #12427 from rootfs/rbd-img
b5dfd56 Merge pull request #12127 from pravisankar/fix-containerized-netdiags
4151dc8 Merge pull request #12844 from smarterclayton/bootstrap_monitoring
6d206d2 Merge pull request #12869 from tdawson/2017-02-build-multiarch
<- SNIP ->