@toptal/davinci-ci 1.15.1-alpha-SPT-2710-overlay-option.20 → 2.0.1-alpha-dependabot-npm-and-yarn-typescript-eslint-parser-5.26.0.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 2.0.0
+
+### Major Changes
+
+- [#1326](https://github.com/toptal/davinci/pull/1326) [`77adee1f`](https://github.com/toptal/davinci/commit/77adee1f003f6336279ca4ac24476bdece8d9828) Thanks [@augustobmoura](https://github.com/augustobmoura)! - - rename the command `davinci qa e2e` to `davinci qa integration`
+
 ## 1.15.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-ci",
-  "version": "1.15.1-alpha-SPT-2710-overlay-option.20+08a58d8e",
+  "version": "2.0.1-alpha-dependabot-npm-and-yarn-typescript-eslint-parser-5.26.0.1+dc2eb180",
   "description": "Continuos integrations tools for frontend projects",
   "publishConfig": {
     "access": "public"
@@ -32,9 +32,9 @@
   "dependencies": {
     "@commitlint/cli": "^16.2.4",
     "@commitlint/config-conventional": "^16.0.0",
-    "@toptal/davinci-cli-shared": "1.5.2-alpha-SPT-2710-overlay-option.105+08a58d8e",
+    "@toptal/davinci-cli-shared": "1.5.2-alpha-dependabot-npm-and-yarn-typescript-eslint-parser-5.26.0.112+dc2eb180",
     "danger": "^11.0.5",
     "markdown-table": "^2.0.0"
   },
-  "gitHead": "08a58d8e0f15f4ec751e3e65c2620276b43c35e1"
+  "gitHead": "dc2eb18062860ef93ea6ad07646701d66af9a0ce"
 }

package/src/configs/jobs/build-image/Jenkinsfile

@@ -4,6 +4,7 @@ image = null
 
 repositoryName =  REPOSITORY_NAME
 repositorySSHUrl = "git@github.com:toptal/${repositoryName}.git"
+env.REPO_NAME_FOR_COMMIT = "toptal/${repositoryName}"
 
 pipeline {
   agent { label 'slave_aws' }
@@ -47,6 +48,7 @@ pipeline {
                 additionalBehaviours: [
                   cleanBeforeCheckout: true
                 ])
+              script { env.COMMIT_FOR_ANVIL = gitCommit() }
               success "== Checked out ${BRANCH} at ${gitCommit()}"
             }
           }

package/src/configs/jobs/build-release-image/Jenkinsfile

@@ -8,6 +8,7 @@ release_docker_image = null
 repositoryName = REPOSITORY_NAME
 repositorySSHUrl = "git@github.com:toptal/${repositoryName}.git"
 releaseImageName = "${repositoryName}-release"
+env.REPO_NAME_FOR_COMMIT = "toptal/${repositoryName}"
 
 pipeline {
   agent { label 'slave_aws' }
@@ -47,6 +48,7 @@ pipeline {
                 additionalBehaviours: [
                   cleanBeforeCheckout: true
                 ])
+              script { env.COMMIT_FOR_ANVIL = gitCommit() }
               success "== Checked out ${BRANCH} at ${gitCommit()}"
             }
           }

package/src/configs/jobs/deploy-helm-run-trigger/Jenkinsfile

@@ -13,6 +13,7 @@ repositorySSHUrl = "git@github.com:toptal/${repositoryName}.git"
 targetBranch = "master"
 configDavinciYaml = "davinci.yaml"
 def repoBullhornSlackChannel
+env.REPO_NAME_FOR_COMMIT = "toptal/${repositoryName}"
 
 buildImageJobName = "${repositoryName}-build-image"
 buildReleaseImageJobName = "${repositoryName}-build-release-image"
@@ -96,6 +97,7 @@ pipeline {
 
         info "Git commit: ${gitCommit()}"
         info "Git branch: ${gitBranch()}"
+        script { env.COMMIT_FOR_ANVIL = gitCommit() }
         success 'Checkout finished'
 
         script {

package/src/configs/jobs/master-main/Jenkinsfile

@@ -392,10 +392,14 @@ pipeline {
 
       steps {
         script {
+            def packageJson = readJSON(file: 'package.json', returnPojo: true)
+            def hasIntegrationCmd = 'test:integration:ci' in (packageJson.scripts ?: [:])
+            def testCommand = hasIntegrationCmd ? 'integration' : 'e2e'
+
             sh """
               docker run \
               --user="root" \
-              --rm gcr.io/toptal-hub/${repositoryName}:${commitId} /bin/bash -c "apt update && apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb  && yarn cypress install > /dev/null && yarn test:e2e:ci"
+              --rm gcr.io/toptal-hub/${repositoryName}:${commitId} /bin/bash -c "apt update && apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb  && yarn cypress install > /dev/null && yarn test:$testCommand:ci"
             """
         }
       } //steps

package/src/configs/jobs/pr-tests/Jenkinsfile

@@ -15,6 +15,9 @@ commitId = params.GITHUB_PR_HEAD_SHA
 repositoryName =  repositoryUrl.tokenize('/').last().split("\\.")[0]
 repositorySSHUrl = "git@github.com:toptal/${repositoryName}.git"
 
+env.COMMIT_FOR_ANVIL = commitId
+env.REPO_NAME_FOR_COMMIT = "toptal/${repositoryName}"
+
 buildImageJobName = "${repositoryName}-build-image"
 buildReleaseImageJobName = "${repositoryName}-build-release-image"
 deployTemployJobName = "${repositoryName}-temploy-helm-run"
@@ -255,10 +258,14 @@ pipeline {
             script {
               ghHelper.notifyPR('Cypress Tests', 'PENDING', 'running', "${commitId}", "${BUILD_URL}", repositoryName)
 
+              def packageJson = readJSON(file: 'package.json', returnPojo: true)
+              def hasIntegrationCmd = 'test:integration:ci' in (packageJson.scripts ?: [:])
+              def testCommand = hasIntegrationCmd ? 'integration' : 'e2e'
+
               sh """
                 docker run \
                 --user="root" \
-                --rm gcr.io/toptal-hub/${repositoryName}:${commitId} /bin/bash -c "apt update && apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb  && yarn cypress install > /dev/null && yarn test:e2e:ci"
+                --rm gcr.io/toptal-hub/${repositoryName}:${commitId} /bin/bash -c "apt update && apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb  && yarn cypress install > /dev/null && yarn test:$testCommand:ci"
               """
             }
           } //steps