#ED-0000 merge: Release-6.0.0 into master branch (#9315)

* Issue #ED-520 fix: Invalid date and school id assignment fixes * Issue #ED-520 fix: logs for debugging * Issue #ED-520 fix: Last update fix * Logs reverted * Issue Fix #ED-2259: Help Page: User not able to Submit the feedback * Issue Fix #ED-2187 remove keyWord * Issue #SB-0000 fix: solution API added to URL pattern of whitelistAPI file * ED-2217 fix: export to csv draft * ED-2217 fix: export to csv draft * ED-2217 fix: export to csv draft * ED-2217 fix: export to csv draft * Issue #ED-0000 fix: Changes to get board value from environment variables * Issue #SB-0000 fix: Angular issue with selected chart level filters * Issue #SB-2356 fix: Error handling when consent update fails for programs * Issue #ED-0000 updating the dependency from other building blocks * ED-2199 fix:epub is not loading * Issue #ED-0000 issue fix for build * Issue #ED-0000 issue fix for build * Issue #ED-0000 issue fix for build * Issue #ED-0000 issue fix for build * Issue #ED-0000 issue fix for build * SB-0000 fix: dashlet issue * Issue #ED-0000 fix: Changed default board in env * logic changed * Increased coverage * logic changed * Issue #SB-2357 fix : observation without rubrics report performace issue * Issue #ED-2364 fix: Selected filters at the chart level showing up for pop-up filter * ED-2217 fix:updated sb-dashlet with latest * use python3.7 to fix build issue * Issue #ED-0000 fix: Fix for desktop issue after adding new env variable * ED-2199 fix: updated the epub library * Issue #ED-2455 fix:Fixed View dashboard button getting displayed while searching do-id from my groups * Issue #ED-2455 fix: refactored the code * Issue #ED-2455 fix: refactored the code * Issue #ED-0000 fix: Upgrade nodein desktop build * issue #co-472 fix: added object Type and primary cat * Issue #ED-0000 fix: added python 3.7 for desktop build * Issue #SB-0000 fix: Install python in desktop docker * Issue #ED-433 fix: configurable dataset for reports * Issue #ED-0000:Test * Issue #ED-0000 fix: Added git to build.sh * Issue #ED-0000:Added git to build.sh * yarn force added * yarn force added * yarn force added * yarn force added * yarn updated npm chown * yarn updated npm chown * yarn updated npm chown * yarn updated npm chown * Issue #ED-0000 fix: Added ts package and permissions to root * yarn updated npm chown * Issue #ED-0000 fix: removed ts * Issue #ED-0000 fix: updated ts install script * remove tsc tild * fs-extra added global * fs-extra added global * ED-2530 fix: The text in the Popup got distorted * fs-extra added global * ED-2530 fix: The text in the Popup got distorted * ED-2530 fix: The text in the Popup got distorted * fs-extra added global * fs-extra added global * fs-extra added global * Issue #ED-2531 fix: Time range filters depends on the slection of the mandatory filter * fs-extra added global * fs-extra added global * upgrade fs-extra * #ED-2544 fix: Fixed url getting reset if board value not specified * Issue #ED-2541 fix: Error messages as per the applicable tabs, programs and the user role. * Issue #ED-0000 fix: [Code Cleanup] Cloud specific references packages are removed * Issue #ED-2572 fix: Custom error for tables in program dashboard * Issue #ED-0000 fix: Build issue * Issue #ED-0000 fix: Update readme * Issue #co-472 fix: added uuid * Issue #co-472 fix: quml package version changed * Issue #co-472 fix: quml version-b=v9 cganges * Issue #ED-2593 fix: Error message fix in program datasets tab before selecting a program * ED-2226 fix: updated the uci-console package * ED-2226 fix: updated the uci-console package * ED-2512 fix:links are not Navigating to the pages * ED-2512 fix:links are not Navigating to the pages * ED-2512 fix:links are not Navigating to the pages * Issue #ED-2593 fix: Error message fix in program datasets tab * ED-2512 fix:links are not Navigating to the pages * Issue #ED-2601 fix: filterig issue fix in program dashboard * Isssue #ED-0000 fix: testing CSP genreralization changes * Isssue #ED-0000 fix: code changes * ED-2226 fix: updated the uci-console package * Isssue #ED-0000 fix: code changes * Isssue #ED-0000 fix: code changes * Isssue #ED-0000 fix: code changes * Isssue #ED-0000 fix: code changes * Isssue #ED-0000 fix: logging * Issue #ED-0000 fix: Added generalized env for cloud service * Issue #ED-0000 fix: Added generalized env for cloud service * Issue #ED-0000 fix: testing csp changes * Issue #ED-2610 fix: Export button alignement and custom error msg fix in program dashboard * Issue #ED-0000: Generalised cofigurations for cloud providers * Issue #ED-0000: removed azure-cloud-service dependency * Issue #ED-1641 and #ED-1642 fix: Timerange filters min and max validation fix for manual input * Increased coverage for datechanged method by mocking dayjs and added max validation for start date based on test case * Issue #ED-2655 fix: Invalidation of text input for time range filters in program datasets * Issue #ED-1274 fix: Delete icon for submitted observation * Issue#ED-2655 fix: Prevention of non-numeric input in dates * unnecessary console log removed * Code smells resolved * Removed unused constructor * Issue #ED-2632: added env variable for oci and updated readme * Issue #ED-2632: desktop env variable changes * Issue #ED-2632: code cleanup and updated env variable * Issue #ED-1722 fix:Observation and program name title in dark mode * Issues #ED-844 and #ED-845 fix: Delete msg and catpure label change * Issue #ED-2632 fix: Added cloudProvider to index.html * Issue #ED-2632 fix: Added cloudProvider to index.html * CSP worspace changes * Issue #ED-2680 fix: Pluralising the observation label * PR review changes * Issue #ED-2684 fix: Add file UI changes * Issue #ED-2632 fix: changed container key for client-cloud-services * Issue #ED-0000 fix: Added README for Desktop application * collection editor upgrade & file upload plugin add * collection editor version update * dashlet removed * dashlet added * yarn update * angukar json update * extra comma remove * Issue #ED-2764 fix: added channelId for fixing failing channel read api * Issue #ED-2780 fix: changes in build script for desktop app * Issue #ED-2798 fix: Fixed language translations * Issue #ED-2799 Add user button is not disable until user fill the name field * Issue #ED-2809 fix: Groups : Activity dashboard button is not appear post join the course * Issue #ED-2812: fixed navigation to editor after copying questionset * Issue #ED-2812: decreased timeout * Update Jenkinsfile Rollback quote changes by code formatter Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Update Jenkinsfile Removed extra comments * Issue #ED-0000 fix: Updated collection editor library * Update Jenkinsfile * Jenkinsfile renamed * Issue #ED-2846 fix: Updated UCI console for alignment fix * Issue #ED-3088: file upload packe upgrade * OCI file upload isssue fixed * Java Error in sonarcube * Issue #ED-0000: fixing deploy failing due to lower node engines * Issue #ED-3575: fix for apis failing in oci desktop * Issue #ED-3575: fix for apis failing in oci desktop --------- Co-authored-by: 5Amogh <[email protected]> Co-authored-by: Rajeev Sathish <[email protected]> Co-authored-by: Rajeev Satish <[email protected]> Co-authored-by: Rajesh Kumaravel <[email protected]> Co-authored-by: Abhishek Nagesh <[email protected]> Co-authored-by: santhosh-tg <[email protected]> Co-authored-by: vaishali <[email protected]> Co-authored-by: vinukumar-vs <[email protected]> Co-authored-by: shubhamBansalCockrate <[email protected]> Co-authored-by: Shubham Bansal <[email protected]> Co-authored-by: Aviral Srivastava <[email protected]> Co-authored-by: Santhosh Gandham <[email protected]> Co-authored-by: Abhishek P N <[email protected]>
Sunbird-Ed · Jul 1, 2024 · a7d68f8 · a7d68f8
1 parent 12255ce
commit a7d68f8
Show file tree

Hide file tree

Showing 568 changed files with 12,794 additions and 16,209 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,31 +1,26 @@
 version: 2.1
 jobs:
   build:
-    machine:
-      image: circleci/classic:latest
+    docker:
+      - image: cimg/node:18.16.0
     steps:
       - checkout
       - run:
           name: run build file
           command: /bin/bash -x build.sh ${CIRCLE_SHA1} test
   test-cases:
     working_directory: ~/portal/src/app/client
-    machine:
+    docker:
       # Ref: https://circleci.com/docs/2.0/configuration-reference/#available-machine-images
-      image: ubuntu-2004:202111-02
+      - image: cimg/node:18.16.0
+    resource_class: large
     steps:
       - checkout:
           path: ~/portal
-      - run: 
+      - run:
+          # Using NodeJS version 16
           name: Installing prerequisites
           command: |-
-            sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6DB5542C356545CF # Adding Heroku keys, else the apt update will fail.
-            sudo apt-get update && sudo apt install -y ca-certificates libxpm4 libxrender1 libgtk2.0-0 libnss3 libgconf-2-4 \
-                  xvfb gtk2-engines-pixbuf \
-                  xfonts-cyrillic xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable
-            curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
-            sudo apt install nodejs -y
-            sudo npm install -g yarn
             node --version
       - run:
           name: ignore-engines
@@ -37,12 +32,12 @@ jobs:
           key: dependency-cache-portal-{{ checksum "package.json" }}
           paths:
             - ./node_modules
-      - run:
-          name: ng lint and building
-          command: 'mkdir -p /tmp/logs && node --max_old_space_size=6000 ./node_modules/@angular/cli/bin/ng build --prod --optimization=false --buildOptimizer=false | tee /tmp/logs/build.log'
+      # - run:
+      #     name: ng lint and building
+      #     command: 'mkdir -p /tmp/logs && node --max_old_space_size=6000 ./node_modules/@angular/cli/bin/ng build --prod --optimization=false --buildOptimizer=false | tee /tmp/logs/build.log'
       - run:
           name: Executing test cases using JEST
-          command: 'npm run test-coverage | tee /tmp/logs/test_cases.log'
+          command: 'npm run test:ci'
       - run:
           name: Install Sonar Scanner
           command: |
@@ -58,4 +53,4 @@ workflows:
   version: 2
   build_and_test:
     jobs:
-      - test-cases
+      - test-cases
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ mochawesome-report
 /src/app/helpers/devConfig.js
 logs
 keys
+.angular
 #DESKTOP APP
 src/desktop/node_modules
 src/desktop/build

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Dockerfile for the player setup
-FROM node:14.19.0-slim
+FROM node:16.19.0-slim
 RUN useradd -u 1001 -md /home/sunbird sunbird
 WORKDIR /home/sunbird
 COPY --chown=sunbird . /home/sunbird/app_dist/

diff --git a/Dockerfile.Build b/Dockerfile.Build
@@ -1,5 +1,5 @@
 #Dockerfile for the player setup
-FROM node:14.19.0
+FROM node:16.19.0
 MAINTAINER "Rajesh Rajendran <[email protected]>"
 RUN sed -i '/jessie-updates/d' /etc/apt/sources.list
 RUN apt-get update && apt-get install -y --no-install-recommends apt-utils \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -57,4 +57,4 @@ node('build-slave') {
         currentBuild.result = "FAILURE"
         throw err
     }
-}
+}
diff --git a/Jenkinsfile.desktop b/Jenkinsfile.desktop
@@ -18,7 +18,11 @@ node() {
         stage('Build') {
             sh """
             cd src/desktop/
-            docker run -d --name offline_build -w /offline node:14.19.0-stretch sleep infinity
+            echo "logging_here_______begin"
+            which git
+            which python
+            echo "logging_here________end"
+            docker run -d --name offline_build -w /offline node:16.19.0-slim sleep infinity
             docker cp .. offline_build:/offline/
             docker exec offline_build bash -x /offline/src/desktop/build.sh
             docker cp offline_build:/offline/src/desktop/app_dist.tar.gz ../../

diff --git a/Jenkinsfile.imagescanner b/Jenkinsfile.imagescanner
@@ -0,0 +1,97 @@
+node('build-slave') {
+    try {
+        String ANSI_GREEN = "\u001B[32m"
+        String ANSI_NORMAL = "\u001B[0m"
+        String ANSI_BOLD = "\u001B[1m"
+        String ANSI_RED = "\u001B[31m"
+        String ANSI_YELLOW = "\u001B[33m"
+
+        ansiColor('xterm') {
+            timestamps {
+                stage('Checkout') {
+                    if (!env.hub_org) {
+                        println(ANSI_BOLD + ANSI_RED + "Uh Oh! Please set a Jenkins environment variable named hub_org with value as registery/sunbidrded" + ANSI_NORMAL)
+                        error 'Please resolve the errors and rerun..'
+                    } else {
+                        println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
+                    }
+                }
+                // cleanWs()
+                checkout scm
+                commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+                build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
+                echo "build_tag: " + build_tag
+
+                stage('Customize dependencies') {
+                    if (params.WL_Customization == null) {
+                        println("Skipping customization")
+                    } else {
+                        sh """
+                      git clone --recurse-submodules ${WL_Customization} sunbirded-portal
+                      cp -r ${WORKSPACE}/sunbirded-portal/images/ ${WORKSPACE}/src/app/client/src/assets
+                      cp -r ${WORKSPACE}/sunbirded-portal/resourceBundles/data/ ${WORKSPACE}/src/app/resourcebundles/
+                      """
+                    }
+                }
+                stage('Snyk Setup') {
+                    if (!env.SNYK_TOKEN) {
+                        println(ANSI_BOLD + ANSI_RED + "Please set a Jenkins environment variable named SNYK_TOKEN" + ANSI_NORMAL)
+                        error 'Please resolve the errors and rerun..'
+                    } else {
+                        sh '''
+                    export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+npm install -g snyk snyk-to-html
+snyk auth ${SNYK_TOKEN}
+                    '''
+                        println(ANSI_BOLD + ANSI_GREEN + "Snyk setup successful!" + ANSI_NORMAL)
+                    }
+                }
+                stage('Build') {
+                    sh("bash ./build.sh  ${build_tag} ${env.NODE_NAME} ${hub_org} ${params.buildDockerImage} ${params.buildCdnAssests} ${params.cdnUrl}")
+                }
+
+                // check if params.buildDockerImage is true, then install snyk and run scan
+                stage('Snyk Scan') {
+                    if (params.buildDockerImage == 'true') {
+                        sh """
+export NVM_DIR="\$HOME/.nvm"
+[ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
+[ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
+snyk container test ${hub_org}/player:${build_tag} --json | snyk-to-html -d -o snyk_results.html
+"""
+                    }
+                }
+                stage('ArchiveArtifacts') {
+                    archiveArtifacts "metadata.json"
+                    // archive the html report for snyk scan
+                    if (params.buildDockerImage == 'true') {
+                        archiveArtifacts 'snyk_results.html'
+                    }
+                    if (params.buildCdnAssests == 'true') {
+                        sh """
+                        rm -rf cdn_assets
+                        mkdir cdn_assets
+                        cp -r src/app/dist-cdn/* cdn_assets/
+                        zip -Jr cdn_assets.zip cdn_assets
+                        """
+                        archiveArtifacts "src/app/dist-cdn/index_cdn.ejs, cdn_assets.zip"
+                    }
+                    currentBuild.description = "${build_tag}"
+                }
+
+                // publish the HTML report for snyk scan
+                stage('PublishReport') {
+                    if (params.buildDockerImage == 'true') {
+                        publishHTML([allowMissing: false, alwaysLinkToLastBuild: false, keepAll: true, reportDir: '', reportFiles: 'snyk_results.html', reportName: 'Snyk Scan Report', reportTitles: ''])
+                    }
+                }
+            }
+        }
+    }
+    catch (err) {
+        currentBuild.result = "FAILURE"
+        throw err
+    }
+}
diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ Installing Sunbird requires two primary software components:
   </tr>
   <tr>
     <td><b>RAM</b></td>
-    <td>> >= 8 Gb</td>
+    <td>> 16 Gb (Minimum 8Gb)</td>
   </tr>
   <tr>
     <td><b>CPU</b></td>
@@ -105,8 +105,8 @@ Installing Sunbird requires two primary software components:
 
 | Software dependencies |  |
 | :--- | ------- |
-| **[Node](https://nodejs.org/en/download/)** | > 14.x.x (Install the latest release of LTS version) |
-| **[Angular CLI](https://angular.io/cli#installing-angular-cli)** | > 11.x.x (Install the latest Angular CLI version) |
+| **[Node](https://nodejs.org/en/download/)** | > 16.19.x (Install the latest release of LTS version) |
+| **[Angular CLI](https://angular.io/cli#installing-angular-cli)** | > 14.x.x (Install the latest Angular CLI version) |
 | **[yarn](https://classic.yarnpkg.com/en/)** | Latest version of yarn: `npm install --global yarn` |
 | **[nodemon](https://www.npmjs.com/package/nodemon)** | Latest version  of nodemon: `npm install -g nodemon` |
 
@@ -153,9 +153,9 @@ Installing Sunbird requires two primary software components:
 
         |           Environment Variable        |  Data Type |             Description                |
         | :-------------------------------------| ---------- | -------------------------------------  |
-        |        sunbird_azure_account_name     |   string   |          Azure account Name            |
-        |        sunbird_azure_account_key      |   string   |          Azure Account Key             |
-        |          sunbird_aws_region           |   string   |        Region for AWS account          |
+        |     sunbird_cloud_storage_provider    |   string   |        Cloud Service Provider          |
+        |   cloud_private_storage_accountname   |   string   |          Cloud Account Name            |
+        |      cloud_private_storage_secret     |   string   |          Cloud Account Key             |
         |  KONG_DEVICE_REGISTER_ANONYMOUS_TOKEN |   boolean  |   Flag value to allow anonymous user   |
         |  sunbird_anonymous_device_register_api|   string   |The API for registering anonymous device|
         |  sunbird_anonymous_register_token     |   string   |    Token to register anonymous device  |
@@ -212,7 +212,6 @@ Installing Sunbird requires two primary software components:
     ├── Sunbirded-portal                                            
     |   ├── /.circleci                           # 
     │   |   └── config.yml                       # Circleci Configuration file
-    |   ├── /experiments                         # -|-
     |   ├── /src/app                             # Sunbird portal or web application
     │   |   ├── /client                          # -|-
     │   |   |    └── src                         # -|-
@@ -253,10 +252,10 @@ Installing Sunbird requires two primary software components:
 
 | Plugin Name                                                                                                  	| Plugin Repository                                                	| npm version 	| NG Version 	|
 |--------------------------------------------------------------------------------------------------------------	|------------------------------------------------------------------	|-------------	|------------	|
-| [@project-sunbird/chatbot-client](https://www.npmjs.com/package/@project-sunbird/chatbot-client)             	| https://github.com/project-sunbird/sunbird-bot-client            	| 3.0.3       	| NG 11      	|
-| [@project-sunbird/common-consumption](https://www.npmjs.com/package/@project-sunbird/common-consumption)     	| https://github.com/Sunbird-Ed/SunbirdEd-consumption-ngcomponents 	| 4.12.0      	| NG 11      	|
-| [@project-sunbird/common-form-elements](https://www.npmjs.com/package/@project-sunbird/common-form-elements) 	| https://github.com/Sunbird-Ed/SunbirdEd-forms                    	| 5.1.1       	| NG 11      	|
-| [@project-sunbird/sb-content-section](https://www.npmjs.com/package/@project-sunbird/sb-content-section)     	| https://github.com/Sunbird-Ed/sb-content-module                  	| 5.1.0       	| NG 11      	|
-| [@project-sunbird/sb-notification](https://www.npmjs.com/package/@project-sunbird/sb-notification)           	| https://github.com/Sunbird-Ed/sb-notification                    	| 5.0.7       	| NG 11      	|
-| [@shikshalokam/sl-questionnaire](https://www.npmjs.com/package/@shikshalokam/sl-questionnaire)           	    | https://github.com/shikshalokam/sl-questionnaire-components       | 2.1.0       	| NG 11      	|
-| [@shikshalokam/sl-reports-library](https://www.npmjs.com/package/@shikshalokam/sl-reports-library)           	| https://github.com/shikshalokam/sl-reports-library                | 2.0.0       	| NG 11      	|
+| [@project-sunbird/chatbot-client](https://www.npmjs.com/package/@project-sunbird/chatbot-client)             	| https://github.com/project-sunbird/sunbird-bot-client            	| 4.0.0       	| NG 13      	|
+| [@project-sunbird/common-consumption](https://www.npmjs.com/package/@project-sunbird/common-consumption)     	| https://github.com/Sunbird-Ed/SunbirdEd-consumption-ngcomponents 	| 6.0.0      	| NG 13      	|
+| [@project-sunbird/common-form-elements-full](https://www.npmjs.com/package/@project-sunbird/common-form-elements-full) 	| https://github.com/Sunbird-Ed/SunbirdEd-forms                    	| 6.0.0       	| NG 14      	|
+| [@project-sunbird/sb-content-section](https://www.npmjs.com/package/@project-sunbird/sb-content-section)     	| https://github.com/Sunbird-Ed/sb-content-module                  	| 6.0.0       	| NG 13      	|
+| [@project-sunbird/sb-notification](https://www.npmjs.com/package/@project-sunbird/sb-notification)           	| https://github.com/Sunbird-Ed/sb-notification                    	| 6.0.0       	| NG 14      	|
+| [@shikshalokam/sl-questionnaire](https://www.npmjs.com/package/@shikshalokam/sl-questionnaire)           	    | https://github.com/shikshalokam/sl-questionnaire-components       | 2.3.0       	| NG 12      	|
+| [@shikshalokam/sl-reports-library](https://www.npmjs.com/package/@shikshalokam/sl-reports-library)           	| https://github.com/shikshalokam/sl-reports-library                | 3.0.1       	| NG 14      	|
diff --git a/build.sh b/build.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 STARTTIME=$(date +%s)
-NODE_VERSION=14.19.0
+export PYTHON=/usr/bin/python3.7
+NODE_VERSION=16.19.0
 echo "Starting portal build from build.sh"
 set -euo pipefail	
 export NVM_DIR="$HOME/.nvm"
@@ -71,7 +72,7 @@ build_server(){
     cd app_dist
     nvm use $NODE_VERSION
     echo "starting server yarn install"
-    yarn install --no-progress --production=true
+    yarn install --ignore-engines --no-progress --production=true
     echo "completed server yarn install"
     node helpers/resourceBundles/build.js -task="phraseAppPull"
 }
@@ -100,4 +101,4 @@ echo {\"image_name\" : \"${name}\", \"image_tag\" : \"${build_tag}\",\"commit_ha
 fi
 
 ENDTIME=$(date +%s)
-echo "build completed. Took $[$ENDTIME - $STARTTIME] seconds."
+echo "build completed. Took $[$ENDTIME - $STARTTIME] seconds."
diff --git a/experiments/ansible/inventory/env/common.yml b/experiments/ansible/inventory/env/common.yml
diff --git a/experiments/ansible/inventory/env/group_vars/all.yml b/experiments/ansible/inventory/env/group_vars/all.yml
diff --git a/experiments/ansible/inventory/env/group_vars/env.yml b/experiments/ansible/inventory/env/group_vars/env.yml
diff --git a/experiments/ansible/portal-experiments.yml b/experiments/ansible/portal-experiments.yml
diff --git a/experiments/experiments.Jenkinsfile b/experiments/experiments.Jenkinsfile
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,4 +57,4 @@ node('build-slave') { @@
             currentBuild.result = "FAILURE"
             throw err
         }
-    }
+    }