Merge ~smoser/cloud-init:fix/makefile-not-find-bin into cloud-init:master

Proposed by Scott Moser
Status: Merged
Merged at revision: 82b2da3a56680b43df00ed31837b8650b5971656
Proposed branch: ~smoser/cloud-init:fix/makefile-not-find-bin
Merge into: cloud-init:master
Diff against target: 13 lines (+1/-1)
1 file modified
Makefile (+1/-1)
Reviewer Review Type Date Requested Status
Chad Smith Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+330954@code.launchpad.net

Commit message

Makefile: No longer look for yaml files in obsolete ./bin/.

The bin/ dir was deleted some time ago, but the Makefile was still
searching for files down it. This didn't cause any problems other
Than a wierd looking error message in a build log.

Description of the change

Makefile: No longer look for yaml files in obsolete ./bin/.

The bin/ dir was deleted some time ago, but the Makefile was still
searching for files down it. This didn't cause any problems other
Than a wierd looking error message in a build log.

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:8ce54e1be2e0cb43cc9e30b5dbccd21a27b8c741
https://jenkins.ubuntu.com/server/job/cloud-init-ci/331/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

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

review: Approve (continuous-integration)
Revision history for this message
Chad Smith (chad.smith) wrote :

+1

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 9e7f4ee..7feea40 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -4,7 +4,7 @@ PYVER ?= $(shell for p in python3 python2; do \
6
7 noseopts ?= -v
8
9-YAML_FILES=$(shell find cloudinit bin tests tools -name "*.yaml" -type f )
10+YAML_FILES=$(shell find cloudinit tests tools -name "*.yaml" -type f )
11 YAML_FILES+=$(shell find doc/examples -name "cloud-config*.txt" -type f )
12
13 PIP_INSTALL := pip install

Subscribers

People subscribed via source and target branches