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

Topic/lukev/improvements #27

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions bibifi-periodic/periodic.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def getSpecificCommitToUpload(self,s,t):
if self.canTestRepo():
b = "%s/%s" % (ARCHIVE_BASE, self.teamName)
try:
os.mkdir(b)
os.makedirs(b)
except:
pass
p = "%s/%s.tar.gz" % (b, s)
Expand All @@ -175,7 +175,7 @@ def getCommitToUpload(self,s):
if self.canTestRepo():
b = "%s/%s" % (ARCHIVE_BASE, self.teamName)
try:
os.mkdir(b)
os.makedirs(b)
except:
pass
p = "%s/%s.tar.gz" % (b, s)
Expand Down Expand Up @@ -367,7 +367,7 @@ def test_team_break(teamdata,testedset):
# Zip up test.
zipdir = "%s%s" % (BREAKS_BASE, teamdata.teamName)
try:
os.mkdir( zipdir)
os.makedirs( zipdir)
except:
pass
zippath = "%s/%s" % (zipdir, testname)
Expand Down Expand Up @@ -461,12 +461,12 @@ def test_team_fix(teamdata, testedset):
commithash,breakids = n
#do an archive at the point of the fix
if not os.path.isdir(ARCHIVE_BASE+"/"+teamdata.teamName):
os.mkdir(ARCHIVE_BASE+"/"+teamdata.teamName)
os.makedirs(ARCHIVE_BASE+"/"+teamdata.teamName)
pth = "%s/%s/%s.tar.gz" % (ARCHIVE_BASE,teamdata.teamName,commithash)
f = file(pth, 'w')
try:
teamdata.repo.archive(f, treeish=commithash)
except git.GitCommandError:
except (git.GitCommandError, TypeError):
print "someone gave us a nonexistant treeish"
return False
f.close()
Expand Down
2 changes: 1 addition & 1 deletion bibifi-runner/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ A team can only run one test at a time.
`runner` will also run the scorer when necessary.
The contest url is the unique url identifier for the contest.
Database settings are loaded from `/fs/mc2-application/config/postgresql.yml`.
AWS settings are laoded from `/fs/mc2-application/config/aws.yml`.
Cloud settings are loaded from `/fs/mc2-application/config/cloud.yml`.
2 changes: 1 addition & 1 deletion bibifi-runner/src/Cloud.hs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ productionCloudYML = "/fs/mc2-application/config/cloud.yml"

loadCloudConfiguration :: String -> IO CloudConfiguration
loadCloudConfiguration configFile = do
-- Read 'config/aws.yml'
-- Read 'config/cloud.yml'
yamlE <- decodeFileEither configFile
case yamlE of
Left err ->
Expand Down