diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ea61416..52173fa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Unreleased - +- Fix Ruby installation with high amount of CPU cores ([#1084](https://github.com/opendevstack/ods-quickstarters/issues/1084)) - Update OS packages by default and bump gitleaks version ([#1049](https://github.com/opendevstack/ods-quickstarters/issues/1049)) - Install java 17 devel only in scala and jdk agents ([#1057](https://github.com/opendevstack/ods-quickstarters/pull/1057)) - Update Angular, Ionic and Typescript Quickstarters ([#1033](https://github.com/opendevstack/ods-quickstarters/issues/1033)) @@ -26,6 +26,7 @@ - Added new function to cypress to log into applications using MFA ([#1070](https://github.com/opendevstack/ods-quickstarters/pull/1070)) - Removal of deprecated versions ([#1068](https://github.com/opendevstack/ods-quickstarters/issues/1068)) - Generate PDF report for cypress and improved environment management ([#1079](https://github.com/opendevstack/ods-quickstarters/pull/1079)) +- Change PDF report zip file name in Cypress Quickstarter ([#1082](https://github.com/opendevstack/ods-quickstarters/pull/1082)) - Mobile testing enablement adding Appium & Sauce Labs in e2e-spock-geb quickstarter ([#1083](https://github.com/opendevstack/ods-quickstarters/pull/1083)) ### Added diff --git a/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi8 b/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi8 index 60b7b4f4..daece93d 100644 --- a/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi8 +++ b/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi8 @@ -177,7 +177,7 @@ RUN cd /opt \ && git clone https://github.com/rbenv/ruby-build.git /opt/rbenv/plugins/ruby-build \ && echo 'export PATH="/opt/rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.bash_profile \ && source ~/.bash_profile \ - && rbenv install $RUBY_VERSION \ + && MAKE_OPTS='-j 4' rbenv install $RUBY_VERSION \ && rbenv global $RUBY_VERSION \ && gem install bundler -v $BUNDLER_VERSION \ && RBENV_VERSION=$RUBY_VERSION gem install bundler -v $BUNDLER_VERSION \ diff --git a/common/jenkins-agents/terraform-2408/docker/Dockerfile.ubi8 b/common/jenkins-agents/terraform-2408/docker/Dockerfile.ubi8 index 7b3cd309..a665463d 100644 --- a/common/jenkins-agents/terraform-2408/docker/Dockerfile.ubi8 +++ b/common/jenkins-agents/terraform-2408/docker/Dockerfile.ubi8 @@ -193,7 +193,7 @@ RUN cd /opt \ && git clone https://github.com/rbenv/ruby-build.git /opt/rbenv/plugins/ruby-build \ && echo 'export PATH="/opt/rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.bash_profile \ && source ~/.bash_profile \ - && rbenv install $RUBY_VERSION \ + && MAKE_OPTS='-j 4' rbenv install $RUBY_VERSION \ && rbenv global $RUBY_VERSION \ && gem install bundler -v $BUNDLER_VERSION \ && RBENV_VERSION=$RUBY_VERSION gem install bundler -v $BUNDLER_VERSION \ diff --git a/e2e-cypress/Jenkinsfile.template b/e2e-cypress/Jenkinsfile.template index 2932b9e1..0df3bbf0 100644 --- a/e2e-cypress/Jenkinsfile.template +++ b/e2e-cypress/Jenkinsfile.template @@ -55,10 +55,10 @@ odsComponentPipeline( ] ) } - if (fileExists('cypress/pdf.zip')) { + if (fileExists('cypress/cypress-test-reports-pdf.zip')) { odsComponentStageUploadToNexus(context, [ - distributionFile: 'cypress/pdf.zip', + distributionFile: 'cypress/cypress-test-reports-pdf.zip', repository: 'leva-documentation', repositoryType: 'raw', targetDirectory: "${targetDirectory}" @@ -121,8 +121,8 @@ def stageTest(def context) { } sh 'npm run generate:pdf' - zip zipFile: 'cypress/pdf.zip', archive: false, dir: 'build/test-results/mochawesome/pdf' - archiveArtifacts artifacts: 'cypress/pdf.zip', fingerprint: true + zip zipFile: 'cypress/cypress-test-reports-pdf.zip', archive: false, dir: 'build/test-results/mochawesome/pdf' + archiveArtifacts artifacts: 'cypress/cypress-test-reports-pdf.zip', fingerprint: true if (fileExists('cypress/videos')) { zip zipFile: 'cypress/videos.zip', archive: false, dir: 'cypress/videos'