From e1a3cf39fc5da2375feb1c292b46414d84de8717 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Mon, 4 Nov 2024 11:05:40 +0100
Subject: [PATCH 1/2] chore: update .gitlab-ci to remove before_scripts step in
 releasing jobs

---
 .gitlab-ci.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e161e7aa9..523877a73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,8 +72,6 @@ generate-apks:
   dependencies:
     - init_submodules
     - build
-  before_script:
-    - apt update && apt install apksigner -y
   script:
     - |
       ./systemAppsUpdateInfo/scripts/generate-apks.sh \
@@ -96,8 +94,6 @@ create-json-files:
   rules:
     - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
       when: on_success
-  before_script:
-    - apt update && apt install jq aapt -y
   script:
     - |
       ./systemAppsUpdateInfo/scripts/create-json-files.sh \
@@ -119,8 +115,6 @@ create-test-release:
   rules:
     - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
       when: manual
-  before_script:
-    - apt update && apt install jq -y
   script:
     - |
       ./systemAppsUpdateInfo/scripts/create-test-release.sh \
@@ -138,8 +132,6 @@ create-release:
   rules:
     - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
       when: manual
-  before_script:
-    - apt update && apt install jq -y
   script:
     - |
       ./systemAppsUpdateInfo/scripts/create-release.sh \
-- 
GitLab


From acd5129561d67152889bb02a2db5d5ccabb1abed Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Mon, 4 Nov 2024 15:05:17 +0100
Subject: [PATCH 2/2] chore: remove openssh installation from
 update-from-upstream job

as suggested by reviewer
---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 523877a73..419c0b2b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -147,7 +147,6 @@ create-release:
     CI_PROJECT_SSH_URL: git@gitlab.e.foundation:$CI_PROJECT_PATH
     GIT_STRATEGY: none
   before_script:
-    - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
     - eval $(ssh-agent -s)
     - echo "${SSH_E_ROBOT_PRIVATE_KEY}" | tr -d '\r' | ssh-add -
     - mkdir -p ~/.ssh
-- 
GitLab