cloud-init

Merge ~chad.smith/cloud-init:ubuntu/devel into cloud-init:ubuntu/devel

  1. Git
  2. lp:~chad.smith/cloud-init
  3. ubuntu/devel
  4. Merge into ubuntu/devel
Proposed by Chad Smith
Status: Merged
Merged at revision: 5ffb1cd9bd30f669a136f26c031cafe7d6a67836
Proposed branch: ~chad.smith/cloud-init:ubuntu/devel
Merge into: cloud-init:ubuntu/devel
Diff against target: 22 lines (+5/-0) (has conflicts)
1 file modified
debian/changelog (+5/-0)
Conflict in debian/changelog
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Needs Fixing
Scott Moser Approve
Review via email: mp+353353@code.launchpad.net

Commit message

New upstream snapshot for release into cosmic.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:f97c6158f3869c8b61816e9f67e40aecee57c05d
https://jenkins.ubuntu.com/server/job/cloud-init-ci/247/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/247/rebuild

review: Approve (continuous-integration)
Revision history for this message
Scott Moser (smoser) wrote :

looks good.

review: Approve
Revision history for this message
Scott Moser (smoser) wrote :

oh wait. one thing.
 http://paste.ubuntu.com/p/gy2vWgQ8Mx/
we need to add Oracle to the ubuntu packaged datasource list.

If you do that, and then just test a 'dpkg-reconfigure', then I'm good.
make sure you add an entry to debian/changelog for it, and +1.

I trust you to do that, so i'll just mark approve.

scott

review: Needs Fixing
Revision history for this message
Scott Moser (smoser) wrote :

approve with those changes.

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://jenkins.ubuntu.com/server/job/cloud-init-autoland-test/28/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/server/job/cloud-init-autoland-test/30/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    FAILED: Ubuntu LTS: Integration

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 31e5f1f..c680325 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,4 @@
6+<<<<<<< debian/changelog
7 cloud-init (18.3-24-gf6249277-0ubuntu2) cosmic; urgency=medium
8
9 * debian/cloud-init.templates: enable Oracle Compute Infrastructure by
10@@ -5,8 +6,12 @@ cloud-init (18.3-24-gf6249277-0ubuntu2) cosmic; urgency=medium
11
12 -- Chad Smith <chad.smith@canonical.com> Fri, 17 Aug 2018 16:01:15 -0600
13
14+=======
15+>>>>>>> debian/changelog
16 cloud-init (18.3-24-gf6249277-0ubuntu1) cosmic; urgency=medium
17
18+ * debian/cloud-init.templates: enable Oracle Compute Infrastructure by
19+ default
20 * New upstream snapshot.
21 - docs: Fix example cloud-init analyze command to match output.
22 [Wesley Gao]

Subscribers

People subscribed via source and target branches