From 14542733a626a1cf79a7af2f6d9d5d5bc8928552 Mon Sep 17 00:00:00 2001 From: ikoleva Date: Mon, 30 May 2022 17:37:44 +0300 Subject: [PATCH 1/2] vdk-heartbeat: pipelines-control-service-integration-tests image rebuild The vdk-heartbeat release documentation required a merge to master, for triggering the release process. However, the control-service CI/CD that depends on vdk-heartbeat, does not consider new vdk-heartbeat versions. Added a comment to control-service `.gitlab-ci.yml` to trigger an IT image update. Documented a workaround in `README.md` until automated. Testing Done: will monitor the pipelines for image rebuild Signed-off-by: ikoleva --- projects/control-service/cicd/.gitlab-ci.yml | 1 + projects/vdk-heartbeat/README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/projects/control-service/cicd/.gitlab-ci.yml b/projects/control-service/cicd/.gitlab-ci.yml index 1249a4ecfc..f0ff60ed8b 100644 --- a/projects/control-service/cicd/.gitlab-ci.yml +++ b/projects/control-service/cicd/.gitlab-ci.yml @@ -265,6 +265,7 @@ control_service_release: - main changes: *control_service_change_locations +# TODO: automatically rebuild image on vdk-heartbeat change control_service_vdk_heartbeat_release: image: docker:19.03.8 services: diff --git a/projects/vdk-heartbeat/README.md b/projects/vdk-heartbeat/README.md index aa65bb7234..c9da80d124 100644 --- a/projects/vdk-heartbeat/README.md +++ b/projects/vdk-heartbeat/README.md @@ -62,6 +62,7 @@ Releases are made to PyPI.
Versioning follows https://semver.org. * A release step in Gitlab CI is automatically triggered after merging changes if build/tests are successful. +* To trigger a control-service integration tests image rebuild, commit any `control_service_change_locations`-defined change in [CONTRIBUTING.md](../control-service/cicd/.gitlab-ci.yml) - until automated * Update major or minor version when necessary only. ## Tests From b03ea3517e17fbddf8ee160d3f6410e995caf7be Mon Sep 17 00:00:00 2001 From: ikoleva Date: Mon, 30 May 2022 17:58:16 +0300 Subject: [PATCH 2/2] vdk-heartbeat: pipelines-control-service-integration-tests image rebuild The vdk-heartbeat release documentation required a merge to master, for triggering the release process. However, the control-service CI/CD that depends on vdk-heartbeat, does not consider new vdk-heartbeat versions. Also, changing pipelines_control_service `version.txt` does not trigger release nor rebuild, for example https://github.com/vmware/versatile-data-kit/pull/814 Added a comment to control-service `.gitlab-ci.yml` to trigger an IT image update. Documented a workaround in `README.md` until automated. Testing Done: will monitor the pipelines for image rebuild Signed-off-by: ikoleva --- projects/vdk-heartbeat/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/vdk-heartbeat/README.md b/projects/vdk-heartbeat/README.md index c9da80d124..801e58a959 100644 --- a/projects/vdk-heartbeat/README.md +++ b/projects/vdk-heartbeat/README.md @@ -62,7 +62,7 @@ Releases are made to PyPI.
Versioning follows https://semver.org. * A release step in Gitlab CI is automatically triggered after merging changes if build/tests are successful. -* To trigger a control-service integration tests image rebuild, commit any `control_service_change_locations`-defined change in [CONTRIBUTING.md](../control-service/cicd/.gitlab-ci.yml) - until automated +* To trigger a control-service integration tests image rebuild, commit any `control_service_change_locations`-defined change in [CONTRIBUTING.md](../control-service/cicd/.gitlab-ci.yml) except [version.txt](../control-service/projects/helm_charts/pipelines-control-service/version.txt)- until automated * Update major or minor version when necessary only. ## Tests