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

Add support for Atlasssian Bamboo Build Server #577

Merged
merged 1 commit into from
Dec 18, 2015

Conversation

krippz
Copy link

@krippz krippz commented Dec 9, 2015

Adding Atlasssian Bamboo Build Server via BambooProvider, Closes #544

@devlead
Copy link
Member

devlead commented Dec 10, 2015

@krippz this PR has a few merge conflicts and therefore won't build on our CI, could you please rebase against latest version of Cake.

@krippz krippz force-pushed the bamboo-build branch 6 times, most recently from 8aa6204 to aba1922 Compare December 11, 2015 21:38
@krippz
Copy link
Author

krippz commented Dec 11, 2015

So I've fixed some stuff... :)

@@ -1,4 +1,4 @@
using System;
Copy link
Member

Choose a reason for hiding this comment

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

This file only has an encoding change, so shouldn't be part of the PR.

Copy link
Author

Choose a reason for hiding this comment

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

sorry about that, i'll have done some reorganizing. will try and update PR later tonight

@devlead
Copy link
Member

devlead commented Dec 16, 2015

Hi @krippz,

I've now reviewed and tested this on Bamboo and in short everything seems to work great. As you stated there are some code duplication but I rather see we address that in an later separate refactor PR.

Tested both standard build
And it picks up build, scm and project info as it should.
Log: https://cakebuild.atlassian.net/builds/download/CAKE-KRIP-JOB1/build_logs/CAKE-KRIP-JOB1-1.log

Object graph:

{
  "IsRunningOnBamboo": true,
  "Environment": {
    "ShortJobKey": "JOB1",
    "ShortJobName": "Default Job",
    "ShortPlanKey": "KRIP",
    "ShortPlanName": "krippz-bamboo-build",
    "Project": {
      "PlanKey": "CAKE-KRIP"
    },
    "Build": {
      "Folder": "C:\\build\\CAKE-KRIP-JOB1",
      "Number": 1,
      "BuildKey": "CAKE-KRIP-JOB1",
      "ResultKey": "CAKE-KRIP-JOB1-1",
      "ResultsUrl": "https://cakebuild.atlassian.net/builds/browse/CAKE-KRIP-JOB1-1",
      "CustomBuild": {
        "IsCustomBuild": false,
        "RevisonName": ""
      }
    },
    "Repository": {
      "Scm": "git",
      "Name": "Devlead/Cake",
      "Branch": "krippz-bamboo-build",
      "Commit": {
        "RepositoryRevision": "a7c84e987b721b1832e5b7f8671e32d530639211"
      }
    }
  }
}

Also tested custom build with a specific reviosion and it picked up that as webb
Log: https://cakebuild.atlassian.net/builds/download/CAKE-KRIP-JOB1/build_logs/CAKE-KRIP-JOB1-2.log

Object graph;

{
  "IsRunningOnBamboo": true,
  "Environment": {
    "ShortJobKey": "JOB1",
    "ShortJobName": "Default Job",
    "ShortPlanKey": "KRIP",
    "ShortPlanName": "krippz-bamboo-build",
    "Project": {
      "PlanKey": "CAKE-KRIP"
    },
    "Build": {
      "Folder": "C:\\build\\CAKE-KRIP-JOB1",
      "Number": 2,
      "BuildKey": "CAKE-KRIP-JOB1",
      "ResultKey": "CAKE-KRIP-JOB1-2",
      "ResultsUrl": "https://cakebuild.atlassian.net/builds/browse/CAKE-KRIP-JOB1-2",
      "CustomBuild": {
        "IsCustomBuild": true,
        "RevisonName": "a7c84e987b721b1832e5b7f8671e32d530639211"
      }
    },
    "Repository": {
      "Scm": "git",
      "Name": "Devlead/Cake",
      "Branch": "krippz-bamboo-build",
      "Commit": {
        "RepositoryRevision": "a7c84e987b721b1832e5b7f8671e32d530639211"
      }
    }
  }
}

So looks good, so would be great if you could

  1. Revert the change to CakeEnvironment.cs
  2. Rebase against latest develop into 1 single commit
  3. Remove WIP and change title to Add support for Atlasssian Bamboo Build Server and refer to Closing issue Adding support for Atlassian Bamboo Build Server  #544 in issue in commit/PR message (read more here ).

and then I'll do a final review before merging.

@krippz krippz changed the title [WIP] bamboo build system Add support for Atlasssian Bamboo Build Server Dec 16, 2015
@krippz
Copy link
Author

krippz commented Dec 17, 2015

@devlead I did make some changes, I renamed BambooProjectInfo to BambooPlanInfo made more sense in the Bamboo concept. I also moved some stuff from the BambooEnvironmentInfo to BambooPlanInfo, made more sense to group these.
Cheers

@gep13
Copy link
Member

gep13 commented Dec 17, 2015

@krippz are you familiar with how to rebase your branch against the latest in the develop branch? A rebase is the preferred option, rather than merging the changes, as it stops the history of the branches from getting polluted with merge commits, like the one that is currently in this PR. If you aren't familiar with it, don't worry, we can talk you through the process.

@krippz
Copy link
Author

krippz commented Dec 18, 2015

@gep13 rebased :)

@gep13
Copy link
Member

gep13 commented Dec 18, 2015

@krippz said...
@gep13 rebased :)

Perfect, thank you!

@devlead devlead merged commit 3330af5 into cake-build:develop Dec 18, 2015
@devlead
Copy link
Member

devlead commented Dec 18, 2015

@krippz merged, thanks for your contribution 👍

@patriksvensson
Copy link
Member

Awesome 👍

@krippz krippz deleted the bamboo-build branch May 17, 2016 15:10
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.

4 participants