Generating fixture internally #457

fao89 · 2019-12-17T18:30:49Z

https://pulp.plan.io/issues/5873
closes #5873

Please be sure you have read our documentation on creating PRs:
https://docs.pulpproject.org/en/3.0/nightly/contributing/pull-request-walkthrough.html

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

mikedep333 · 2019-12-18T20:55:51Z

.travis/before_script.sh

+cd $TRAVIS_BUILD_DIR/../pulp-operator
+.travis/pulp-operator-check-and-wait.sh
+cd $TRAVIS_BUILD_DIR/../pulpcore
+


Are these changes specific to pulpcore?

If so, they need to be in PRE_BEFORE_SCRIPT or POST_BEFORE_SCRIPT.

If they need to be in pulpcore, they need to be in the plugin-template. There would be a corresponding PR in plugin-template reviewed at the same time as pulpcore's PR.

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

daviddavis · 2019-12-20T13:11:52Z

.travis/pre_before_script.sh

+		access_log $TRAVIS_BUILD_DIR/tmp/access.log;
+    }
+}
+NGINXCONF


Any chance we could put this into a separate file inside the .travis directory?

daviddavis · 2019-12-20T13:15:07Z

.travis/pre_before_script.sh

+nginx -c `pwd`/tmp/etc/nginx.conf
+
+cat .travis/pulp-smash-config.json | \
+    jq 'setpath(["custom","fixtures_origin"]; "http://localhost:8000/fixtures/")' > temp.json


Why are you setting fixtures_origin here instead of just setting it in pulp-smash-config.json? Is this to avoid conflicts with plugins?

Exactly, if I declare it in pulp-smash-config.json, it would force all plugins to have local fixtures

daviddavis · 2019-12-20T13:16:20Z

This is looking great. Very excited to have this. 👍

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

daviddavis · 2019-12-20T15:12:52Z

.travis/nginx.conf

+            autoindex_exact_size off;
+	    }
+        error_log $TRAVIS_BUILD_DIR/tmp/error.log;
+		access_log $TRAVIS_BUILD_DIR/tmp/access.log;


nitpick -- the indentation is inconsistent in this file.

https://pulp.plan.io/issues/5873 Required PR: pulp/pulp-smash#1228 closes #5873

mikedep333

It looks like we should refactor this into an option for plugin-template. Only a few variables would be involved: A boolean generate local fixtures (which affects nginx in .travis.yml) in template_config.yml, blocks of code based in before_script.sh if it is true, and we'd change the pulp-smash-config.json based on the plugin name.

Note that you seemed to indicate that pulp-smash-config.json is part of plugin-template, but I do not see it there.

mikedep333 · 2019-12-20T16:55:02Z

.travis.yml

@@ -35,6 +35,7 @@ addons:
    packages:
      - httpie
      - jq
+      - nginx


Where is the corresponding change to plugin-template?

Without it, it would be blown away by it being run.

fao89 · 2019-12-20T17:04:49Z

It looks like we should refactor this into an option for plugin-template. Only a few variables would be involved: A boolean generate local fixtures (which affects nginx in .travis.yml) in template_config.yml, blocks of code based in before_script.sh if it is true, and we'd change the pulp-smash-config.json based on the plugin name.

Note that you seemed to indicate that pulp-smash-config.json is part of plugin-template, but I do not see it there.

pulp-smash-config.json from pulpcore is used in all plugins:
https://github.com/pulp/plugin_template/blob/master/templates/travis/.travis/before_script.sh.j2#L23-L27

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

fao89 requested a review from a team December 17, 2019 18:30

fao89 force-pushed the 5873 branch 2 times, most recently from cdf856e to 8c19cce Compare December 17, 2019 19:07

fao89 changed the title ~~Generating fixture internally~~ WIP - Generating fixture internally Dec 17, 2019

fao89 force-pushed the 5873 branch 5 times, most recently from e790852 to b5f19d7 Compare December 18, 2019 14:17

fao89 added a commit to fao89/pulp_file that referenced this pull request Dec 18, 2019

Generating fixture internally

a3b1eab

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

mikedep333 reviewed Dec 18, 2019

View reviewed changes

fao89 added a commit to fao89/pulp_file that referenced this pull request Dec 19, 2019

Generating fixture internally

ee5e434

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

fao89 force-pushed the 5873 branch 2 times, most recently from 589b083 to 2a8d2bc Compare December 19, 2019 18:18

fao89 added a commit to fao89/pulp_file that referenced this pull request Dec 19, 2019

Generating fixture internally

450c324

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

fao89 added a commit to fao89/pulp_file that referenced this pull request Dec 19, 2019

Generating fixture internally

915e224

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

fao89 force-pushed the 5873 branch 14 times, most recently from 208c1ec to 55dcc6f Compare December 19, 2019 22:13

fao89 force-pushed the 5873 branch 3 times, most recently from a251068 to 0b3d7cc Compare December 20, 2019 02:37

fao89 added a commit to fao89/pulp_file that referenced this pull request Dec 20, 2019

Generating fixture internally

4f47a70

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

fao89 changed the title ~~WIP - Generating fixture internally~~ Generating fixture internally Dec 20, 2019

fao89 added a commit to fao89/pulp_file that referenced this pull request Dec 20, 2019

Generating fixture internally

e387d04

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

daviddavis reviewed Dec 20, 2019

View reviewed changes

fao89 force-pushed the 5873 branch from 0b3d7cc to 1e132c2 Compare December 20, 2019 13:37

fao89 added a commit to fao89/pulp_file that referenced this pull request Dec 20, 2019

Generating fixture internally

1527ab4

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

fao89 added a commit to fao89/pulp_file that referenced this pull request Dec 20, 2019

Generating fixture internally

1da8ad9

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

fao89 force-pushed the 5873 branch 2 times, most recently from ead0459 to 77253c4 Compare December 20, 2019 14:29

fao89 added a commit to fao89/pulp_file that referenced this pull request Dec 20, 2019

Generating fixture internally

b5ce539

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

fao89 added a commit to fao89/pulp_file that referenced this pull request Dec 20, 2019

Generating fixture internally

3130d2a

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

fao89 force-pushed the 5873 branch from 77253c4 to 1b6c80c Compare December 20, 2019 14:41

daviddavis reviewed Dec 20, 2019

View reviewed changes

fao89 force-pushed the 5873 branch from 1b6c80c to ba3843c Compare December 20, 2019 15:15

Generating fixture internally

5b79497

https://pulp.plan.io/issues/5873 Required PR: pulp/pulp-smash#1228 closes #5873

fao89 force-pushed the 5873 branch from ba3843c to 5b79497 Compare December 20, 2019 15:16

daviddavis approved these changes Dec 20, 2019

View reviewed changes

mikedep333 approved these changes Dec 20, 2019

View reviewed changes

mikedep333 requested changes Dec 20, 2019

View reviewed changes

daviddavis merged commit 45f2ab2 into pulp:master Dec 20, 2019

daviddavis pushed a commit to pulp/pulp_file that referenced this pull request Dec 20, 2019

Generating fixture internally

3a9eafa

https://pulp.plan.io/issues/5872 Required PR: pulp/pulpcore#457 Required PR: pulp/pulp-smash#1228 closes #5872

bmbouter added the Needs Cherry Pick label Jan 14, 2020

pulpbot mentioned this pull request Jan 14, 2020

Cherry picks to 3.0 #497

Merged

pulpbot removed the Needs Cherry Pick label Jan 14, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Generating fixture internally #457

Generating fixture internally #457

fao89 commented Dec 17, 2019

mikedep333 Dec 18, 2019

daviddavis Dec 20, 2019

fao89 Dec 20, 2019

daviddavis Dec 20, 2019

fao89 Dec 20, 2019

daviddavis commented Dec 20, 2019

daviddavis Dec 20, 2019

mikedep333 left a comment

mikedep333 Dec 20, 2019

fao89 commented Dec 20, 2019

Generating fixture internally #457

Generating fixture internally #457

Conversation

fao89 commented Dec 17, 2019

mikedep333 Dec 18, 2019

Choose a reason for hiding this comment

daviddavis Dec 20, 2019

Choose a reason for hiding this comment

fao89 Dec 20, 2019

Choose a reason for hiding this comment

daviddavis Dec 20, 2019

Choose a reason for hiding this comment

fao89 Dec 20, 2019

Choose a reason for hiding this comment

daviddavis commented Dec 20, 2019

daviddavis Dec 20, 2019

Choose a reason for hiding this comment

mikedep333 left a comment

Choose a reason for hiding this comment

mikedep333 Dec 20, 2019

Choose a reason for hiding this comment

fao89 commented Dec 20, 2019