Merge pull request 'refs #2521 have CrearImagenGit not receive the "tag" parameter' (#102) from crearimagengit-no-tag into main
ogclient/pipeline/tag This commit looks good Details
ogclient/pipeline/head This commit looks good Details

Reviewed-on: #102
main 1.1.0
Natalia Serrano 2025-07-24 15:39:18 +02:00
commit 2be41695d6
2 changed files with 11 additions and 9 deletions

View File

@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [1.1.0] - 2025-07-24
### Changed
- Have CrearImagenGit not receive the "tag" parameter
## [1.0.3] - 2025-07-24
### Fixed

View File

@ -4,7 +4,6 @@ import resource
import logging
import NetLib
import ogGlobals
import SystemLib
import DiskLib
@ -35,7 +34,7 @@ class OgLogger(logging.StreamHandler):
def create_image(disk_num, partition_num, repo, image_name, tagName):
def create_image(disk_num, partition_num, repo, image_name):
ntfs_impl = NTFSImplementation.NTFS3G
og_git = OpengnsysGitLibrary(ntfs_implementation = ntfs_impl)
@ -44,8 +43,6 @@ def create_image(disk_num, partition_num, repo, image_name, tagName):
device = DiskLib.ogDiskToDev(disk_num, partition_num)
if og_git.initRepo(device, image_name):
return 0
#if tagName:
# og_git.tag(device = device, tagName = tagName, commit = "HEAD", message = "Image created")
else:
return 1
@ -63,14 +60,13 @@ def main():
if len(sys.argv) != 6:
sys.exit(SystemLib.ogRaiseError([], ogGlobals.OG_ERR_FORMAT, "Incorrect number of arguments. Usage: CrearImagenGit disk_num partition_num image_name repo tag"))
if len(sys.argv) < 5:
sys.exit(SystemLib.ogRaiseError([], ogGlobals.OG_ERR_FORMAT, "Incorrect number of arguments. Usage: CrearImagenGit disk_num partition_num image_name repo"))
# repo - repositorio, ip address. Opcional porque oglive lo recibe como parametro de kernel
# tag - tag a crear automaticamente. Opcional, no necesitamos crear un tag siempre.
disk_num, partition_num, image_name, repo, tag = sys.argv[1:6]
disk_num, partition_num, image_name, repo = sys.argv[1:5]
opengnsys_log_dir = "/opt/opengnsys/log"
@ -96,7 +92,7 @@ def main():
logger.info("Starting CrearImagenGit")
retval = create_image(disk_num, partition_num, repo, image_name, tag)
retval = create_image(disk_num, partition_num, repo, image_name)