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

1297_NewFixtureData #969

Merged
merged 2 commits into from
Nov 1, 2018
Merged

Conversation

NickPhura
Copy link
Contributor

@NickPhura NickPhura commented Oct 23, 2018

Trello Card

(Ignore my comments from scrum this morning, I realized how I was overthinking this, so its no longer an issue)

Rename old registries.json, wellsearch.json.gz, and aquifers.json fixtures to registries_large.json, wellsearch_large.json.gz, and aquifers_large.json respectively.

  • We could delete these entirely, but they might be useful for some heavy-data tests in future?

Add new wellsearch.json fixture with reduced data/size.

  • the new wellsearch.json just contains a small portion of the data from the original wellsearch.json (4 wells), which does cover the breadth of the tables from the original fixture data.
  • Includes a small well tag id (2 - as requested by Lindsay) and an extra large id.

Add new registries.json fixture with reduced data/size.

  • the new registries.json is brand new from users/companies created via the app, with a variety of statuses and types.

Add new aquifers.json fixture with reduced data/size (To match the reduced wellsearch.json fixture).

  • the new aquifers.json contains a small portion of the data from the original aquifers.json.

(Not sure how well this code reviews..)

@NickPhura
Copy link
Contributor Author

@Sybrand
Copy link
Member

Sybrand commented Oct 29, 2018

@DerekRoberts @NickPhura merging this in would break the pipeline - fixtures wouldn't get loaded. I can fix the jenkinsfile to pull in the renamed fixtures, but I don't want to cause conflicts on the pipeline you're working. Should we wait on merging this into 1.44.0 ?

Copy link
Member

@Sybrand Sybrand left a comment

Choose a reason for hiding this comment

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

We need to modify jenkins to load the renamed fixtures, or the build will break.

@DerekRoberts
Copy link
Member

@DerekRoberts @NickPhura merging this in would break the pipeline - fixtures wouldn't get loaded. I can fix the jenkinsfile to pull in the renamed fixtures, but I don't want to cause conflicts on the pipeline you're working. Should we wait on merging this into 1.44.0 ?

Good plan. Let's aim for 1.44.0, when the timing isn't as close.

@NickPhura
Copy link
Contributor Author

NickPhura commented Oct 30, 2018

@DerekRoberts @Sybrand
Correct me if I am addressing the wrong issue:

In the jenkinsfile currently, it specifies "wellsearch.json.gz" but you don't need to specify the extensions at all (at least when running loaddata locally).

You can just specify "wellsearch" and it will still scan and find the right fixture automatically.

So we could update the jenkinsfile to just specify "wellsearch" and then it will work for the old zipped fixture AND the new updated unzipped fixture, depending on what fixture files exist in the branch at the time.

@DerekRoberts
Copy link
Member

@NickPhura Make that Jenkinsfile change and keep rolling!

@NickPhura
Copy link
Contributor Author

Pointed the Jenkinsfile to the original 'large' fixtures, for now.

…large.json

Add new registries/wellsearch fixtures with reduced data/size.

Rename original aquifers.json to aquifers_large.json.
Add new reduced aquifers.json with fixtures to match the reduced wellsearch.json.

Rename old registries/wellsearch fixtures from <name>.json to <name>_large.json
Add new registries/wellsearch fixtures with reduced data/size.

Rename original aquifers.json to aquifers_large.json.
Add new reduced aquifers.json with fixtures to match the reduced wellsearch.json.

Temporarily use 'large' fixtures in jenkinsfile.
@bcgov-csnr-cd bcgov-csnr-cd temporarily deployed to dev October 31, 2018 01:29 Inactive
@Sybrand Sybrand changed the base branch from release/1.43.0 to release/1.44.0 October 31, 2018 16:13
@Sybrand Sybrand closed this Oct 31, 2018
@DerekRoberts DerekRoberts changed the base branch from release/1.44.0 to holding_pattern November 1, 2018 19:21
@DerekRoberts DerekRoberts reopened this Nov 1, 2018
@DerekRoberts DerekRoberts changed the base branch from holding_pattern to release/1.44.0 November 1, 2018 20:41
@bcgov-csnr-cd bcgov-csnr-cd temporarily deployed to dev November 1, 2018 23:28 Inactive
@DerekRoberts DerekRoberts merged commit 0bf70f3 into release/1.44.0 Nov 1, 2018
@DerekRoberts DerekRoberts deleted the task/1297_NewFixtureData branch November 1, 2018 23:39
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

4 participants