Skip to content
This repository was archived by the owner on Mar 23, 2020. It is now read-only.

Add Makefiles to CNV and OCS directories #57

Merged
merged 3 commits into from
Aug 30, 2019

Conversation

johnbieren
Copy link
Contributor

It is much easier from a CI perspective to have common make targets to call to deploy the various components of the appliance. Otherwise, changes to script names (such as the PR to add CNV-2.1) would break CI

This is following a similar mindset to #41

I force pushed my branch which made it so I couldn't reopen the old PR

Signed-off-by: Johnny Bieren [email protected]

@@ -1,14 +1,19 @@
.PHONY: default all requirements configure
default: requirements configure
Copy link
Collaborator

Choose a reason for hiding this comment

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

probably should have pre_install, cluster and post_install in
.PHONY

@@ -1,14 +1,19 @@
.PHONY: default all requirements configure
default: requirements configure

all: default
all: cluster post_install
Copy link
Collaborator

Choose a reason for hiding this comment

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

I am thinking the default should be just create, @e-minguez suggested leaving Post install as a manual step when I suggested his changes

@e-minguez - opinion of making post_install part of all - I am okay with that

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm ok

Copy link
Contributor Author

Choose a reason for hiding this comment

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

From what I gathered on the CNV-2.1 PR, the post_install steps will be necessary to deploy CNV-2.1, which is part of the appliance so I figured it should be part of all. However, if you guys think it is better to keep it out of all I can make that change np

OCS/Makefile Outdated
@@ -0,0 +1,5 @@
.PHONY: all run
all: run
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is there a more descriptive target instead of "run"

Did you want to define a default?

CNV/Makefile Outdated
@@ -0,0 +1,8 @@
.PHONY: all run upgrade
all: run
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is there a more descriptive target instead of "run"?

Did you want to install a default target?

@sreichar
Copy link
Collaborator

Johnny can you also look at what I have pending as part of #50

@johnbieren
Copy link
Contributor Author

Johnny can you also look at what I have pending as part of #50

@sreichar It looks like you are doing the same thing there. Should I just put feedback on that PR and drop this one? Also I am assuming you meant 54, as 50 is an issue about the README being outdated, which links to 54

@johnbieren
Copy link
Contributor Author

Or I can keep my OCS and CNV Makefiles in this PR and drop the OpenShift and root level ones?

…ets in OCS/CNV Makefiles

Signed-off-by: Johnny Bieren <[email protected]>
@sreichar
Copy link
Collaborator

I like the idea of the split, can you do OCS and CNV and I'll merge our Top level and OpenShift in PR #54

Copy link
Collaborator

@sreichar sreichar left a comment

Choose a reason for hiding this comment

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

lgtm

@sreichar sreichar merged commit 99479ce into openshift-kni:master Aug 30, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants