GuilloteauQ/study-docker-repro-longevity
1
0
Fork 0
Code Issues 6 Pull Requests Actions Projects Releases Wiki Activity

Added stdout to output. Fixed log. Opening build_status file in append mode. Added verbose flag to run script.

Browse Source
This commit is contained in:
antux18 2024-07-15 11:28:38 +02:00
parent 0e6b181310
commit da114662ba
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ecg.py
View File

@ -125,16 +125,15 @@ def buildstatus_saver(output):
None None
""" """
file_exists = os.path.exists(buildstatus_path) file_exists = os.path.exists(buildstatus_path)
buildstatus_file = open(buildstatus_path, "w+") buildstatus_file = open(buildstatus_path, "a")
# # Writing header in case file didn't exist: # # Writing header in case file didn't exist:
# if not file_exists: # if not file_exists:
# buildstatus_file.write("yaml_path,timestamp,error") # buildstatus_file.write("yaml_path,timestamp,error")
for error_cat, errors_list in build_errors.items(): for error_cat, error in build_errors.items():
for error in errors_list: if error in output:
if error in output: now = datetime.datetime.now()
now = datetime.datetime.now() timestamp = str(datetime.datetime.timestamp(now))
timestamp = str(datetime.datetime.timestamp(now)) buildstatus_file.write(f"{config_path},{timestamp},{error_cat}\n")
buildstatus_file.write(f"{config_path},{timestamp},{error_cat}")
buildstatus_file.close() buildstatus_file.close()
def build_image(config, src_dir): def build_image(config, src_dir):
@ -159,13 +158,13 @@ def build_image(config, src_dir):
path = os.path.join(src_dir, config["dockerfile_location"]) path = os.path.join(src_dir, config["dockerfile_location"])
build_command = "docker build -t " + config["image_name"] + " ." build_command = "docker build -t " + config["image_name"] + " ."
build_process = subprocess.run(build_command.split(" "), cwd=path, capture_output=True) build_process = subprocess.run(build_command.split(" "), cwd=path, capture_output=True)
# build_output = "stdout:\n" + build_process.stdout.decode("utf-8") + "\nstderr:\n" + build_process.stderr.decode("utf-8") build_output = "stdout:\n" + build_process.stdout.decode("utf-8") + "\nstderr:\n" + build_process.stderr.decode("utf-8")
build_output = build_process.stderr.decode("utf-8") # build_output = build_process.stderr.decode("utf-8")
logging.info(f"Output of '{build_command}':") logging.info(f"Output of '{build_command}':")
logging.info(build_output) logging.info(build_output)
return_code = build_process.returncode return_code = build_process.returncode
logging.info(f"Command '{build_command}' exited with code {return_code}") logging.info(f"Command '{build_command}' exited with code {return_code}")
buildstatus_saver(build_process.stderr.decode("utf-8")) buildstatus_saver(build_output)
return return_code == 0 return return_code == 0
def check_env(config, src_dir): def check_env(config, src_dir):
@ -278,7 +277,7 @@ def main():
# Setting up the log: will be displayed both on stdout and to the specified # Setting up the log: will be displayed both on stdout and to the specified
# file: # file:
logging.info(f"Output will be stored in {log_path}") print(f"Output will be stored in {log_path}")
logging.basicConfig(filename = log_path, filemode = "w", format = '%(levelname)s: %(message)s', level = logging.INFO) logging.basicConfig(filename = log_path, filemode = "w", format = '%(levelname)s: %(message)s', level = logging.INFO)
# Parsing the input YAML file including the configuration of # Parsing the input YAML file including the configuration of
@ -289,8 +288,8 @@ def main():
config_file.close() config_file.close()
verbose = args.verbose verbose = args.verbose
# if verbose: if verbose:
# logging.getLogger().addHandler(logging.StreamHandler(sys.stdout)) logging.getLogger().addHandler(logging.StreamHandler(sys.stdout))
src_dir = download_sources(config) src_dir = download_sources(config)
successful_build = build_image(config, src_dir) successful_build = build_image(config, src_dir)

2
run.sh
View File

@ -13,4 +13,4 @@ then
mkdir $CACHE_DIR mkdir $CACHE_DIR
fi fi
./ecg.py $TESTFILE -p $OUTPUT_PATH/pkglist.csv -l $OUTPUT_PATH/log.txt -b $OUTPUT_PATH/build_status.csv -c $CACHE_DIR ./ecg.py $TESTFILE -v -p $OUTPUT_PATH/pkglist.csv -l $OUTPUT_PATH/log.txt -b $OUTPUT_PATH/build_status.csv -c $CACHE_DIR