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

Cleanup old ubiquity provisioner installation method and refactor acceptance test dir #201

Merged
merged 2 commits into from
Jul 5, 2018

Conversation

shay-berman
Copy link
Contributor

@shay-berman shay-berman commented Jul 2, 2018

This PR is for removing old files that are no longer relevant in the project. Below the list:

  1. Remove old ubiqutiy linux service concept. From 1.0 we moved to deploy ubiqutiy as k8s deployment instead of regular linux service. Removing the following related files:
  • scripts/setup b/scripts/setup
  • scripts/setup_provisioner b/scripts/setup_provisioner
  • scripts/ubiquity-k8s-provisioner.env
  • scripts/ubiquity-k8s-provisioner.service
  • deploy/k8s_deployments/*
  • ubiquity-k8s-provisioner.conf
  1. Relocate the [deploy/k8s_deployments/setup_flex.sh] to [scripts/setup_flex.sh] and update Dockerfile.Flex according.

  2. Reorganized the acceptance test scripts for simplicity. Just move all the acceptance test scripts to a dedicated directory scripts/acceptance_tests (before it was spread across ./scripts and ./deploy directory).

Same clean up was done on the ubiquity repo for ubiquity server -> IBM/ubiquity#221


This change is Reviewable

@shay-berman
Copy link
Contributor Author

shay-berman commented Jul 2, 2018

  • Tested the acceptance tests manually and passed OK after the change.
  • Tested the build of the flex - passed OK

Its ready to merge to dev, waiting for code review.

Copy link
Collaborator

@olgashtivelman olgashtivelman left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 32 files reviewed, 1 unresolved discussion (waiting on @shay-berman, @olgashtivelman, and @yadaven)


Dockerfile.Flex, line 14 at r1 (raw file):

WORKDIR /root/
COPY --from=0 /go/src/github.com/IBM/ubiquity-k8s/ubiquity-k8s-flex .
COPY --from=0 /go/src/github.com/IBM/ubiquity-k8s/scripts/setup_flex.sh .

did you also move this file to the scripts folder as part of some other commit? because I dont see any file like: scripts/setup_flex.sh in the dev branch.

Copy link
Contributor Author

@shay-berman shay-berman left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 32 files reviewed, 1 unresolved discussion (waiting on @shay-berman and @yadaven)


Dockerfile.Flex, line 14 at r1 (raw file):

Previously, olgashtivelman wrote…

did you also move this file to the scripts folder as part of some other commit? because I dont see any file like: scripts/setup_flex.sh in the dev branch.

yes I did
you don't see it in the dev branch yet, because in this PR (not in dev yet) i moved the file to the new location. See the commit of this PR and u will see that the file moved to the new location.

Copy link
Collaborator

@olgashtivelman olgashtivelman left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 32 files reviewed, all discussions resolved (waiting on @yadaven)


Dockerfile.Flex, line 14 at r1 (raw file):

Previously, shay-berman wrote…

yes I did
you don't see it in the dev branch yet, because in this PR (not in dev yet) i moved the file to the new location. See the commit of this PR and u will see that the file moved to the new location.

ok i guess it was some hidden change i missed :)

Copy link
Collaborator

@olgashtivelman olgashtivelman left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: 0 of 32 files reviewed, all discussions resolved (waiting on @yadaven)

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.

None yet

2 participants