From 04964c0dc46763781f4efb1aa9af6142520aedf3 Mon Sep 17 00:00:00 2001
From: Drew Reed <Drew.Reed@arm.com>
Date: Thu, 26 Jan 2023 16:16:28 +0000
Subject: [PATCH] ci: Workaround jfrog cli issue

The jfrog v2 cli has an issue at the moment with the access-token
parameter so we have to use it as a password parameter.
https://github.com/jfrog/jfrog-cli/issues/1814

Changelog: bug
Signed-off-by: Drew Reed <Drew.Reed@arm.com>
---
 .gitlab/ci/lava-test.yml            | 4 ++--
 .gitlab/lava/n1sdp/acs_suite.yml.j2 | 4 ++--
 .gitlab/lava/n1sdp/ptest.yml.j2     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab/ci/lava-test.yml b/.gitlab/ci/lava-test.yml
index 5da6766..14c7377 100644
--- a/.gitlab/ci/lava-test.yml
+++ b/.gitlab/ci/lava-test.yml
@@ -109,7 +109,7 @@
     - |
       jfrog config add artifactory-aws --interactive=false \
       --artifactory-url=$ARTIFACTORY_AWS_URL --user=$ARTIFACTORY_USER \
-      --access-token=$ARTIFACTORY_PASS;
+      --password=$ARTIFACTORY_PASS;
     - echo LAUNCH_CI_JOB_NAME_AND_ID="${LAUNCH_CI_JOB_NAME}/${LAUNCH_CI_JOB_ID}"
     - jobinfo="${LAUNCH_CI_JOB_NAME}/${LAUNCH_CI_JOB_ID}"
     - buildid="oss-cassini/${CI_PROJECT_PATH}/${jobinfo}"
@@ -181,7 +181,7 @@
     - |
       jfrog config add artifactory-aws --interactive=false \
       --artifactory-url=$ARTIFACTORY_AWS_URL --user=$ARTIFACTORY_USER \
-      --access-token=$ARTIFACTORY_PASS;
+      --password=$ARTIFACTORY_PASS;
     - echo LAUNCH_CI_JOB_NAME_AND_ID="${LAUNCH_CI_JOB_NAME}/${LAUNCH_CI_JOB_ID}"
     - jobinfo="${LAUNCH_CI_JOB_NAME}/${LAUNCH_CI_JOB_ID}"
     - buildid="oss-cassini/${CI_PROJECT_PATH}/${jobinfo}"
diff --git a/.gitlab/lava/n1sdp/acs_suite.yml.j2 b/.gitlab/lava/n1sdp/acs_suite.yml.j2
index f966b7d..980ef1d 100644
--- a/.gitlab/lava/n1sdp/acs_suite.yml.j2
+++ b/.gitlab/lava/n1sdp/acs_suite.yml.j2
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved.
+# Copyright (c) 2022-2023, Arm Limited or its affiliates. All rights reserved.
 #
 # SPDX-License-Identifier: MIT
 ---
@@ -273,7 +273,7 @@ actions:
               - apt -q update
               - apt -q install -y curl
               - curl -fL https://getcli.jfrog.io/v2 | sh
-              - ./jfrog config add artifactory-aws --interactive=false --artifactory-url={{ ARTIFACTORY_AWS_URL }} --user={{ ARTIFACTORY_USER }} --access-token={{ ARTIFACTORY_PASS }};
+              - ./jfrog config add artifactory-aws --interactive=false --artifactory-url={{ ARTIFACTORY_AWS_URL }} --user={{ ARTIFACTORY_USER }} --password={{ ARTIFACTORY_PASS }};
               - lsblk
               - mkdir acs
               - mount /dev/sda2 acs
diff --git a/.gitlab/lava/n1sdp/ptest.yml.j2 b/.gitlab/lava/n1sdp/ptest.yml.j2
index 476e0d7..2dc7bb7 100644
--- a/.gitlab/lava/n1sdp/ptest.yml.j2
+++ b/.gitlab/lava/n1sdp/ptest.yml.j2
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved.
+# Copyright (c) 2022-2023, Arm Limited or its affiliates. All rights reserved.
 #
 # SPDX-License-Identifier: MIT
 ---
@@ -194,7 +194,7 @@ actions:
           run:
             steps:
               - lava-test-case cassini-integration-tests --shell "ptest-runner"
-              - jfrog-cli config add artifactory-aws --interactive=false --artifactory-url={{ ARTIFACTORY_AWS_URL }} --user={{ ARTIFACTORY_USER }} --access-token={{ ARTIFACTORY_PASS }};
+              - jfrog-cli config add artifactory-aws --interactive=false --artifactory-url={{ ARTIFACTORY_AWS_URL }} --user={{ ARTIFACTORY_USER }} --password={{ ARTIFACTORY_PASS }};
               - |
                 cat << EOF > ./upload_spec.json
                 {
-- 
GitLab