Task/tailor for update templates - For review only by henrjk · Pull Request #227 · opendevstack/ods-project-quickstarters

henrjk · 2019-06-13T14:59:49Z

For review only -- not quite ready to be merged yet

This implements the changes described in comment #38 (comment).

The code requires opendevstack/ods-jenkins-shared-library#91 so that the openshift folder generated is actually being processed with tailor during the jenkins build.

Besides this requirement the code is not ready to be pulled in as it currently has rundeck job copies for testing. This will have to be cleaned up before delivering.

opendevstack/ods-jenkins-shared-library#91 fixes some problems encountered with opendevstack/ods-jenkins-shared-library#85.

Please review!

gerardcl

what a proposal! I will try to get some time a fully test it and also go through the code carefully! but as far as I've understood this is something I would agree on having/happening! 👍

gerardcl · 2019-06-13T17:33:07Z

 }

-library identifier: 'ods-library@production', retriever: modernSCM(
+library identifier: 'ods-library@feature/tailor-deploy-debug', retriever: modernSCM(


@henrjk I would recommend the identifier to match this PR source branch name, or to point to production. Anyway, as you already mentioned, if the purpose of this PR is only for researching and proposing yet it is fine for me!

Yes, I wanted to remove this change (so that it would be production) once the fix (or something equivalent) in branch feature/tailor-deploy-debug is merged.

michaelsauter · 2019-06-25T07:04:28Z

Unify multiple yml into one
Remove references to PR branch
Ensure all params are present in configuration sample

henrjk · 2019-06-27T13:58:13Z

I updated the PR with

Unify multiple yml into one
Remove references to PR branch

This has been tested in production with the mentioned PR branch of the shared library. It should be retested with the final version of the shared library

Also before this can be merged (after additional review) I will still need to:

Ensure all params are present in configuration sample.

I will leave another comment when I am done.

I discussed the PR with @gerardcl and @hugowschneider. Based on their feedback I changed the way the openshift folder is generated so it is easier to customize. See comments in

ods-project-quickstarters/boilerplates/init-openshift.sh

Line 5 in 955f6c6

# Generates default openshift setup for tailor .

Other things we talked about which I do not want to pursue in this issue were:

Could the openshift folder be used for migration and would bring advantages compared to the current approach with occonfig_artifacts?
Since the delete-component.sh scripts have been removed, give instructions in the component creation output on how to delete the generated component based on the app label.
Should tailor use the --upsert-only switch when updating based on the openshift folder (perhaps only for the initial update)?
And some more stylistic changes:
Combine several consecutive script executions in rundeck jobs into a single script. However we are not sure whether this work would carry forward once we move away from rundeck.
Also use script instead of exec everywhere in the rundeck script. I would like to do this separately or postpone as it will require retesting all changed scripts.

Change summary: - Use yml format allowing exec with multiple lines in code. - Old templates were left untouched (to be removed later) - New templates are in ocp_templates/ocp-config/ and configuration in ods-configuration/ods-project-quickstarters/ocp-config and ods-configuration/ods-project-quickstarters/templates - Made sure that ocp-templates/Dockerfile assume same layout as on local file system. - Rundeck to setup dockerbuild context. - Provide rundeck jobs for testing ending in <original-name>-qs-38.yaml - Improved consistency of rshiny label usage. This allows better specificity of tailor commands. - Remove namespace entries in templates which appear to not be needed. Scripts in ocp-templates/scripts: - create-projects.sh exits when invoked with unknown parameter - Some scripts support a -d|--debug flag which causes -v to be used in tailor invocations. - Some scripts support a --status command so that tailor status is used. - Simplified delete-component script using selectors. - Extract portion of create-projects.sh into create-cd-jenkins.sh for easier testability. - Better output log message. - delete-rshiny-app.sh: add message to user explaining and showing shared resources which are not deleted.

…ed project. Requires opendevstack/ods-jenkins-shared-library#85 replace upload-templates.sh with tailor opendevstack#38 Change summary: - Use yml format allowing exec with multiple lines in code. - New templates are in ocp_templates/ocp-config/ and configuration in ods-configuration/ods-project-quickstarters/templates - Provide rundeck jobs for testing ending in <original-name>-qs-38.yaml - Improved consistency of rshiny label usage. This allows better specificity of tailor commands. - Remove namespace entries in templates which appear to not be needed. Scripts in ocp-templates/scripts: - create-projects.sh exits when invoked with unknown parameter - Some scripts support a -d|--debug flag which causes -v to be used in tailor invocations. - Some scripts support a --status command so that tailor status is used. - Extract portion of create-projects.sh into create-cd-jenkins.sh for easier testability. - Better output log message.

labels: app: '${PROJECT}-${COMPONENT}' with label template to distinguish individual parts.

debugging: use shared library feature/tailor-deploy-debug remove unused bc-docker and use TAGVERSION in component-environment/bc.yml

rshiny-app: avoid that render*.sh scripts end up in generated bitbucket repo undo move of rshiny-app Jenkinsfile and README.md another attempt with rshiny-app readme.

adjustments in rundeck jobsrshiny-app more files reorg

This if for Task/tailor for update templates - Pull Request #227 in opendevstack/ods-project-quickstarters see opendevstack/ods-project-quickstarters#227

henrjk · 2019-06-27T15:49:27Z

I consider this now complete.

henrjk requested review from clemensutschig, gerardcl, hugowschneider, michaelsauter, rattermeyer, tjaeschke and torstenhe June 13, 2019 14:59

gerardcl reviewed Jun 13, 2019

View reviewed changes

henrjk added 14 commits June 27, 2019 16:39

rshiny support

d18ed13

Uniform label for rshiny as well.

8d7b0d2

labels: app: '${PROJECT}-${COMPONENT}' with label template to distinguish individual parts.

remove code no longer needed

d8805f0

Using bash set -ux and exit on unknown parameter. Remove unused params.

04b366c

debugging: use shared library feature/tailor-deploy-debug remove unused bc-docker and use TAGVERSION in component-environment/bc.yml

Use TAGVERSION in dc also.

592f60c

openshift templates for component combined in one file

2d7beee

remove create-component.sh script which is no longer needed.

e81c7ec

Restructure init-openshift.sh for easier customization.

6d8e39a

rshiny-app: avoid that render*.sh scripts end up in generated bitbucket repo undo move of rshiny-app Jenkinsfile and README.md another attempt with rshiny-app readme.

adjustments in rundeck jobs

ed49713

adjustments in rundeck jobsrshiny-app more files reorg

update rundeck jobs for production

2f49e9a

Use production shared library.

b315f96

remove rundeck scripts used for testing

d374298

henrjk force-pushed the task/tailor-for-update-templates branch from 955f6c6 to d374298 Compare June 27, 2019 14:59

henrjk mentioned this pull request Jun 27, 2019

Task/tailor for update templates opendevstack/ods-configuration-sample#36

Open

Use feature/tailor-deploy shared library in NE backend

62da32a

henrjk closed this Aug 27, 2019

henrjk deleted the task/tailor-for-update-templates branch August 27, 2019 08:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Task/tailor for update templates - For review only#227

Task/tailor for update templates - For review only#227
henrjk wants to merge 15 commits intoopendevstack:masterfrom
BIX-Digital:task/tailor-for-update-templates

henrjk commented Jun 13, 2019

Uh oh!

gerardcl left a comment

Uh oh!

gerardcl Jun 13, 2019

Uh oh!

henrjk Jun 14, 2019

Uh oh!

michaelsauter commented Jun 25, 2019

Uh oh!

henrjk commented Jun 27, 2019

Uh oh!

henrjk commented Jun 27, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

henrjk commented Jun 13, 2019

Uh oh!

gerardcl left a comment

Choose a reason for hiding this comment

Uh oh!

gerardcl Jun 13, 2019

Choose a reason for hiding this comment

Uh oh!

henrjk Jun 14, 2019

Choose a reason for hiding this comment

Uh oh!

michaelsauter commented Jun 25, 2019

Uh oh!

henrjk commented Jun 27, 2019

Uh oh!

henrjk commented Jun 27, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants