From f918ed0618a64afe3475accae6d179007dae5ee8 Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Wed, 5 Jul 2023 17:23:10 +0200 Subject: [PATCH 1/2] CLOUD-793 - Set fixed version of jq to 1.6 --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f538311d77..7f492b3aba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -280,7 +280,7 @@ pipeline { sh ''' sudo yum install -y https://repo.percona.com/yum/percona-release-latest.noarch.rpm || true sudo percona-release enable-only tools - sudo yum install -y jq | true + sudo yum install -y | true if [ ! -d $HOME/google-cloud-sdk/bin ]; then rm -rf $HOME/google-cloud-sdk @@ -300,6 +300,8 @@ pipeline { sudo sh -c "curl -s -L https://github.com/mikefarah/yq/releases/download/v4.27.2/yq_linux_amd64 > /usr/local/bin/yq" sudo chmod +x /usr/local/bin/yq + sudo sh -c "curl -s -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 > /usr/local/bin/jq" + sudo chmod +x /usr/local/bin/jq ''' withCredentials([file(credentialsId: 'cloud-secret-file', variable: 'CLOUD_SECRET_FILE')]) { sh ''' From 5096e7e5be5f4329f51fc95a6de111df97500a5f Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Wed, 5 Jul 2023 18:01:02 +0200 Subject: [PATCH 2/2] Fix yq version to 4.34.1 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7f492b3aba..688e2d431f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -298,7 +298,7 @@ pipeline { curl -s -L https://github.com/mitchellh/golicense/releases/latest/download/golicense_0.2.0_linux_x86_64.tar.gz \ | sudo tar -C /usr/local/bin --wildcards -zxvpf - - sudo sh -c "curl -s -L https://github.com/mikefarah/yq/releases/download/v4.27.2/yq_linux_amd64 > /usr/local/bin/yq" + sudo sh -c "curl -s -L https://github.com/mikefarah/yq/releases/download/v4.34.1/yq_linux_amd64 > /usr/local/bin/yq" sudo chmod +x /usr/local/bin/yq sudo sh -c "curl -s -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 > /usr/local/bin/jq" sudo chmod +x /usr/local/bin/jq