Revert "Merge from dev to v2 (#2338)" (#2339)

This reverts commit a299c0e.

.github/workflows/pythonTests.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        suite: [ pip, pipenv ]
+        suite: [ pip, pipenv, poetry ]
         os: [ ubuntu, windows, macos ]
     runs-on: ${{ matrix.os }}-latest
     steps:
@@ -35,6 +35,9 @@ jobs:
       - name: Setup Pipenv
         if: ${{ matrix.suite == 'pipenv' }}
         run: python -m pip install pipenv
+      - name: Setup Poetry
+        if: ${{ matrix.suite == 'poetry' }}
+        run: python -m pip install poetry
       - name: Checkout code
         uses: actions/checkout@v3
         with:

.github/workflows/scriptTests.yml

@@ -78,7 +78,7 @@ jobs:
       - name: "Get latest release"
         id: latest-release
         run: |
-         export LATEST_RELEASE=`curl https://api.github.com/repos/jfrog/jfrog-cli/releases/latest -s --retry 10 | jq .name -r | cut -c 2-`
+         export LATEST_RELEASE=`curl https://api.github.com/repos/jfrog/jfrog-cli/releases/latest -s | jq .name -r | cut -c 2-`
          echo "LATEST_RELEASE=$LATEST_RELEASE" >> "$GITHUB_OUTPUT"
         shell: bash
 

CONTRIBUTING.md

@@ -104,6 +104,7 @@ The available test types are:
 | `-test.go`           | Go tests           |
 | `-test.pip`          | Pip tests          |
 | `-test.pipenv`       | Pipenv tests       |
+| `-test.poetry`       | Poetry tests       |
 | `-test.nuget`        | Nuget tests        |
 | `-test.plugins`      | Plugins tests      |
 | `-test.distribution` | Distribution tests |

Jenkinsfile

@@ -46,18 +46,6 @@ node("docker") {
             }
         }
 
-        state('synchronize branches') {
-            if ("$EXECUTION_MODE".toString().equals("Build CLI")) {
-                masterBranch = 'v2'
-                devBranch = 'dev'
-                if (BRANCH?.trim() == 'v1') {
-                    masterBranch = 'v1'
-                    devBranch = 'dev-v1'
-                }
-                synchronizeBranches(masterBranch, devBranch)
-            }
-        }
-
         stage('install npm') {
             installNpm(nodeVersion)
         }
@@ -160,28 +148,6 @@ def runRelease(architectures) {
     }
 }
 
-def synchronizeBranches(masterBranch, devBranch) {
-    dir("$cliWorkspace/$repo") {
-        releaseTag = "v$RELEASE_VERSION"
-        withCredentials([string(credentialsId: 'ecosystem-github-automation', variable: 'GITHUB_ACCESS_TOKEN')]) {
-            stage("Merge to $masterBranch") {
-                sh """#!/bin/bash
-                    git merge origin/$devBranch --no-edit
-                    git push "https://$GITHUB_ACCESS_TOKEN@github.com/jfrog/jfrog-cli.git"
-                """
-            }
-            stage("Merge to $devBranch") {
-                sh """#!/bin/bash
-                    git checkout $devBranch
-                    git merge origin/$masterBranch --no-edit
-                    git push "https://$GITHUB_ACCESS_TOKEN@github.com/jfrog/jfrog-cli.git"
-                    git checkout $masterBranch
-                """
-            }
-        }
-    }
-}
-
 def createTag() {
     stage('Create a tag and a GitHub release') {
         dir("$jfrogCliRepoDir") {

build/npm/v2-jf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jfrog-cli-v2-jf",
-  "version": "2.52.0",
+  "version": "2.51.1",
   "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
   "homepage": "https://github.com/jfrog/jfrog-cli",
   "preferGlobal": true,

build/npm/v2/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jfrog-cli-v2",
-  "version": "2.52.0",
+  "version": "2.51.1",
   "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
   "homepage": "https://github.com/jfrog/jfrog-cli",
   "preferGlobal": true,

distribution_test.go

@@ -445,7 +445,7 @@ func TestUpdateBundleProps(t *testing.T) {
 	cleanDistributionTest(t)
 }
 
-func TestBundlePathMappingFromPatternAndTarget(t *testing.T) {
+func TestBundlePathMapping(t *testing.T) {
 	initDistributionTest(t)
 
 	// Upload files
@@ -465,28 +465,6 @@ func TestBundlePathMappingFromPatternAndTarget(t *testing.T) {
 	cleanDistributionTest(t)
 }
 
-func TestBundlePathMappingFromPatternAndTargetUsingSpec(t *testing.T) {
-	initDistributionTest(t)
-
-	// Upload files
-	specFile, err := tests.CreateSpec(tests.DistributionUploadSpecB)
-	assert.NoError(t, err)
-	runRt(t, "u", "--spec="+specFile)
-
-	// Create and distribute release bundle with path mapping from <DistRepo1>/data/ to <DistRepo2>/target/
-	spec, err := tests.CreateSpec(tests.DistributionCreateWithPatternAndTarget)
-	assert.NoError(t, err)
-	runDs(t, "rbc", tests.BundleName, bundleVersion, "--sign", "--spec="+spec)
-	runDs(t, "rbd", tests.BundleName, bundleVersion, "--site=*", "--sync")
-
-	// Validate files are distributed to the target mapping
-	spec, err = tests.CreateSpec(tests.DistributionMappingDownload)
-	assert.NoError(t, err)
-	inttestutils.VerifyExistInArtifactory(tests.GetBundleMappingExpected(), spec, serverDetails, t)
-
-	cleanDistributionTest(t)
-}
-
 func TestBundlePathMappingUsingSpec(t *testing.T) {
 	initDistributionTest(t)