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

Redesign Build Deployment Process (External) #961

Merged
merged 96 commits into from
Aug 12, 2024
Merged
Changes from 1 commit
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
93c2232
Read secret_list from actual file if present, else use sample file.
Mar 21, 2024
a80d7e4
Matched conf/log files with internal repo
Mar 26, 2024
20e1856
Reading push.json values from environment variables
Mar 29, 2024
4a1005e
Choose analysis/debug.conf file based on ENV var
Apr 1, 2024
d4dad4a
Testing method to share tag between repos
nataliejschultz Apr 4, 2024
02c7fc7
Changed webserver.conf.json to Environment variables + Removed sed / …
Apr 10, 2024
4aeb4a6
Corrected logic to set test webserver ENV variables
Apr 11, 2024
2531672
Changed Webserver.conf + Db.conf to Environment variable + Removed se…
Apr 12, 2024
ea57afa
Reverting Natalie testing artifact changes + Adding image-push-merge
Apr 12, 2024
e8344e9
Fixes for failing TestTokenQueries print assertions
Apr 12, 2024
7f0d5f0
Fixes for failing TestTokenQueries print assertions
Apr 12, 2024
05551c8
Try-except block brought to the top
Apr 16, 2024
cabc98a
Merge pull request #2 from MukuFlash03/consolidate-differences
MukuFlash03 Apr 16, 2024
c39b537
Removed extraneous seed_model.json
Apr 16, 2024
385bc97
Merge pull request #3 from MukuFlash03/consolidate-differences
MukuFlash03 Apr 16, 2024
273c2ca
TODO added to change to master branch in YML file
Apr 24, 2024
2fdb469
Adding image-push-merge branch to automated CI/CD tests
Apr 24, 2024
91abdea
Upload artifact test - 1
Apr 25, 2024
bbdaaae
Upload artifact test - 2
Apr 25, 2024
5d0ca02
Added temporary test file
Apr 25, 2024
2e8a911
Changes to actions + echo
nataliejschultz Apr 25, 2024
f5aae47
Upload artifact test - 3
Apr 25, 2024
051ef66
Repository dispatch send - 1
Apr 26, 2024
6c44865
Workflow dispatch send - 1
Apr 26, 2024
4569dfb
Workflow dispatch send - 2
Apr 26, 2024
b562c2c
Workflow dispatch send - 3
Apr 26, 2024
25109b3
Workflow dispatch send - 3
Apr 26, 2024
709f3cf
Workflow dispatch send - 4
Apr 26, 2024
4b42185
Workflow dispatch send - 5
Apr 26, 2024
12d09ae
Workflow dispatch send - 6
Apr 26, 2024
94c129b
Workflow dispatch send - 7
Apr 26, 2024
0dd1245
Matrix build send - 1
Apr 26, 2024
5434914
Matrix build send - 2
Apr 26, 2024
0fd3e9d
Matrix build send - 3
Apr 26, 2024
ab399ea
Matrix build send - 3
Apr 26, 2024
91c0c1f
Matrix build send - 4
Apr 26, 2024
acecf3e
Matrix build send - 5
Apr 26, 2024
e778b3f
Fix for "url" KeyError observed in public-dash redesign testing
Apr 30, 2024
a0190d4
Fix for "url" KeyError observed in public-dash redesign testing
Apr 30, 2024
776f0b9
Artifact + Matrix - 1
May 2, 2024
17ac3cc
Artifact + Matrix - 2
May 2, 2024
706f74c
Artifact + Matrix - 3
May 2, 2024
d724fd1
Revert "Adding image-push-merge branch to automated CI/CD tests"
May 2, 2024
e6a2d79
Revert "TODO added to change to master branch in YML file"
May 2, 2024
4b3dfdf
Merge branch 'image-push-merge' into tags-combo-approach
May 2, 2024
f033f06
Added TODOs in github actions workflow YAML file
May 3, 2024
1207d79
Artifact + Matrix - 4
May 3, 2024
f306e8c
Merge branch 'consolidate-differences' into tags-combo-approach
nataliejschultz May 6, 2024
00d9565
Merge pull request #4 from MukuFlash03/tags-combo-approach
nataliejschultz May 6, 2024
f182790
Cleanup changes
nataliejschultz May 9, 2024
f1869ab
Update image_build_push.yml
nataliejschultz May 9, 2024
8f05955
More cleanup + testing image build?
nataliejschultz May 9, 2024
912bd34
Hardcoded webhost
nataliejschultz May 16, 2024
738b629
secret.py
nataliejschultz May 17, 2024
7102508
Restore intake.conf.sample
nataliejschultz May 17, 2024
3d77439
Reverting webserver.conf.sample
nataliejschultz May 17, 2024
a0f2424
Removing check_unset_env_vars
nataliejschultz May 17, 2024
9fb0e5a
Merge branch 'consolidate-differences' of https://github.com/MukuFlas…
nataliejschultz May 17, 2024
18a8872
Removing check_unset_env_vars functionality
nataliejschultz May 17, 2024
53015c7
Update image_build_push.yml
nataliejschultz May 21, 2024
41a410c
Update docker_start_script.sh
nataliejschultz May 21, 2024
7405ff1
Setting DB_HOST=db
nataliejschultz May 21, 2024
cd62247
Update docker_start_script.sh
nataliejschultz May 22, 2024
ebc8188
Rename debug.conf.internal.json to debug.conf.prod.json
nataliejschultz May 22, 2024
41ae79f
Update config.py
nataliejschultz May 22, 2024
290b0fc
Push to rename
nataliejschultz May 22, 2024
29869cd
Update and rename debug.conf.json.sample to debug.conf.dev.json
nataliejschultz May 22, 2024
38209ef
common.py fix?
nataliejschultz May 22, 2024
da485c2
Removing redundant DB_HOST setting
nataliejschultz May 23, 2024
e6b388b
reverting dockerfile + start script changes
nataliejschultz May 24, 2024
bb03c42
Testing workflows with compose
nataliejschultz May 26, 2024
cf50d17
Triggering workflows.
nataliejschultz May 26, 2024
6a21f5d
Reverting image_build_push.yml
nataliejschultz May 26, 2024
b961417
Not showing changes to branches for some reason in image_build_push.yml
nataliejschultz Jun 10, 2024
a245e7d
Adding comment to see if it resolves github display error
nataliejschultz Jun 17, 2024
2067055
🩹 Don't cat the db.conf file
shankari Aug 7, 2024
3000758
🩹 Use the correct filename in the gitignore
shankari Aug 7, 2024
6a8a13f
🩹 Set the default value for the `DB_HOST` as well
shankari Aug 7, 2024
fc183cb
🩹 Unify the supported user inputs across the debug and prod configs
shankari Aug 7, 2024
51e16de
🩹 Remove the cat of db.conf from the integration tests as well
shankari Aug 7, 2024
7ab37b6
🩹 Cleanup environment variables in the basic start script
shankari Aug 7, 2024
727c00c
♻️ Move the config to a different file name that makes more sense
shankari Aug 10, 2024
7f1be92
♻️ Refactor the backwards config file to be reusable
shankari Aug 10, 2024
7177e71
🔊 log the full backtrace if the config file is formatted incorrectly
shankari Aug 10, 2024
168ef10
♻️ Move the api configuration into the backwards compat as well
shankari Aug 10, 2024
3dea305
♻️ Move the api configuration into the backwards compat as well
shankari Aug 10, 2024
a0f0c6a
♻️ Move the push configuration into the backwards compat as well
shankari Aug 12, 2024
10624a6
🔊 Indicate that we are using the default production config
shankari Aug 12, 2024
0fe9476
Merge branch 'consolidate-differences' of https://github.com/MukuFlas…
shankari Aug 12, 2024
11d2a89
♻️ Pull out the code to reset the environment variable overrides to …
shankari Aug 12, 2024
4cc4c58
✅ Fix the expected text while checking for tokens
shankari Aug 12, 2024
357d4b8
🔥 Remove the copied over config file
shankari Aug 12, 2024
b6f59b0
♻️ Access the environment variables from the config using `.get`
shankari Aug 12, 2024
ec38835
✅ Remove environment variables that are likely to be different across…
shankari Aug 12, 2024
1a0d451
✅ Delete all irrelevant config variables
shankari Aug 12, 2024
2fe0816
✅ Copy/paste the actual tests from the failed CI run
shankari Aug 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
🔊 Indicate that we are using the default production config
if no override is found
shankari committed Aug 12, 2024
commit 10624a64c485d17e258add8037b1c7bf4b913b56
2 changes: 1 addition & 1 deletion emission/analysis/config.py
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ def get_config_data():
config_file = open('conf/analysis/debug.conf.json')
except:
if os.getenv("PROD_STAGE") == "TRUE":
print("In production environment, opening internal debug.conf")
print("In production environment, config not overridden, using default production debug.conf")
config_file = open('conf/analysis/debug.conf.prod.json')
else:
print("analysis.debug.conf.json not configured, falling back to sample, default configuration")