From 0ae118c6aebdddf2269b0670edc41e3a2254fe99 Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Wed, 30 Dec 2020 09:57:11 +0300 Subject: [PATCH] [Ubuntu] Create symlink for Pester test running (#2349) * Create symlink for test running * Fix 1604 and 2004 templates * Fix php and haskell running * Minor fix * Fix new added tests * Fix symlink * Minor fix * Fix script permissions * Minor fix * Fix firefox and rust tests * Fix new merged tests --- images/linux/scripts/helpers/invoke-tests.sh | 9 ++------- images/linux/scripts/installers/7-zip.sh | 1 - images/linux/scripts/installers/aliyun-cli.sh | 1 - images/linux/scripts/installers/android.sh | 1 - images/linux/scripts/installers/ansible.sh | 1 - images/linux/scripts/installers/aws-sam-cli.sh | 1 - images/linux/scripts/installers/aws.sh | 1 - images/linux/scripts/installers/azcopy.sh | 1 - images/linux/scripts/installers/azure-cli.sh | 1 - images/linux/scripts/installers/azure-devops-cli.sh | 1 - images/linux/scripts/installers/bazel.sh | 1 - images/linux/scripts/installers/clang.sh | 1 - images/linux/scripts/installers/cleanup.sh | 3 +++ images/linux/scripts/installers/cmake.sh | 1 - images/linux/scripts/installers/configure-environment.sh | 4 ++++ images/linux/scripts/installers/docker-compose.sh | 1 - images/linux/scripts/installers/docker-moby.sh | 1 - images/linux/scripts/installers/erlang.sh | 1 - images/linux/scripts/installers/firefox.sh | 2 -- images/linux/scripts/installers/gcc.sh | 1 - images/linux/scripts/installers/gfortran.sh | 1 - images/linux/scripts/installers/git.sh | 1 - images/linux/scripts/installers/github-cli.sh | 1 - images/linux/scripts/installers/google-chrome.sh | 1 - images/linux/scripts/installers/google-cloud-sdk.sh | 1 - images/linux/scripts/installers/haskell.sh | 1 - images/linux/scripts/installers/heroku.sh | 1 - images/linux/scripts/installers/hhvm.sh | 1 - images/linux/scripts/installers/homebrew.sh | 1 - images/linux/scripts/installers/julia.sh | 1 - images/linux/scripts/installers/kubernetes-tools.sh | 1 - images/linux/scripts/installers/leiningen.sh | 1 - images/linux/scripts/installers/mercurial.sh | 1 - images/linux/scripts/installers/miniconda.sh | 1 - images/linux/scripts/installers/mono.sh | 1 - images/linux/scripts/installers/mssql-cmd-tools.sh | 1 - images/linux/scripts/installers/netlify.sh | 1 - images/linux/scripts/installers/oc.sh | 1 - images/linux/scripts/installers/oras-cli.sh | 1 - images/linux/scripts/installers/packer.sh | 1 - images/linux/scripts/installers/phantomjs.sh | 1 - images/linux/scripts/installers/php.sh | 1 - images/linux/scripts/installers/pipx-packages.sh | 1 - images/linux/scripts/installers/pollinate.sh | 1 - images/linux/scripts/installers/pulumi.sh | 1 - images/linux/scripts/installers/r.sh | 1 - images/linux/scripts/installers/rndgenerator.sh | 1 - images/linux/scripts/installers/rust.sh | 1 - images/linux/scripts/installers/sbt.sh | 1 - images/linux/scripts/installers/selenium.sh | 1 - images/linux/scripts/installers/sphinx.sh | 1 - images/linux/scripts/installers/subversion.sh | 1 - images/linux/scripts/installers/swift.sh | 1 - images/linux/scripts/installers/swig.sh | 1 - images/linux/scripts/installers/terraform.sh | 1 - images/linux/scripts/installers/vcpkg.sh | 1 - images/linux/scripts/installers/vercel.sh | 1 - images/linux/ubuntu1604.json | 3 ++- images/linux/ubuntu1804.json | 3 ++- images/linux/ubuntu2004.json | 3 ++- 60 files changed, 15 insertions(+), 65 deletions(-) diff --git a/images/linux/scripts/helpers/invoke-tests.sh b/images/linux/scripts/helpers/invoke-tests.sh index f2b18dbe..8aac32eb 100644 --- a/images/linux/scripts/helpers/invoke-tests.sh +++ b/images/linux/scripts/helpers/invoke-tests.sh @@ -4,10 +4,5 @@ ## Desc: Helper function for invoking tests ################################################################################ -invoke_tests() { - local TEST_FILE="$1" - local TEST_NAME="$2" - - pwsh -Command "Import-Module '$HELPER_SCRIPTS/Tests.Helpers.psm1' -DisableNameChecking - Invoke-PesterTests -TestFile \"$TEST_FILE\" -TestName \"$TEST_NAME\"" -} \ No newline at end of file +pwsh -Command "Import-Module '$HELPER_SCRIPTS/Tests.Helpers.psm1' -DisableNameChecking + Invoke-PesterTests -TestFile \"$1\" -TestName \"$2\"" diff --git a/images/linux/scripts/installers/7-zip.sh b/images/linux/scripts/installers/7-zip.sh index a2c614a8..357bd905 100644 --- a/images/linux/scripts/installers/7-zip.sh +++ b/images/linux/scripts/installers/7-zip.sh @@ -4,7 +4,6 @@ ## Desc: Installs 7-zip ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install 7-Zip apt-get update -y diff --git a/images/linux/scripts/installers/aliyun-cli.sh b/images/linux/scripts/installers/aliyun-cli.sh index 86b41f89..e322e687 100644 --- a/images/linux/scripts/installers/aliyun-cli.sh +++ b/images/linux/scripts/installers/aliyun-cli.sh @@ -4,7 +4,6 @@ ## Desc: Installs Alibaba Cloud CLI ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install Alibaba Cloud CLI URL=$(curl -s https://api.github.com/repos/aliyun/aliyun-cli/releases/latest | jq -r '.assets[].browser_download_url | select(contains("aliyun-cli-linux"))') diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 45e9f620..c5971539 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -7,7 +7,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/invoke-tests.sh function filter_components_by_version { minimumVersion=$1 diff --git a/images/linux/scripts/installers/ansible.sh b/images/linux/scripts/installers/ansible.sh index d30a84c6..d566e5b7 100644 --- a/images/linux/scripts/installers/ansible.sh +++ b/images/linux/scripts/installers/ansible.sh @@ -6,7 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh -source $HELPER_SCRIPTS/invoke-tests.sh # ppa:ansible/ansible doesn't contain packages for Ubuntu20.04 if isUbuntu16 || isUbuntu18 ; then diff --git a/images/linux/scripts/installers/aws-sam-cli.sh b/images/linux/scripts/installers/aws-sam-cli.sh index a5f0abb9..d134f309 100644 --- a/images/linux/scripts/installers/aws-sam-cli.sh +++ b/images/linux/scripts/installers/aws-sam-cli.sh @@ -5,7 +5,6 @@ ## Requires Python >=3.6, must be run as non-root user after toolset installation ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Download latest aws sam cli sources TarballUrl=$(curl -s https://api.github.com/repos/aws/aws-sam-cli/releases/latest | jq -r '.tarball_url') diff --git a/images/linux/scripts/installers/aws.sh b/images/linux/scripts/installers/aws.sh index 99e8c0d8..3a81ae81 100644 --- a/images/linux/scripts/installers/aws.sh +++ b/images/linux/scripts/installers/aws.sh @@ -5,7 +5,6 @@ ################################################################################ source $HELPER_SCRIPTS/os.sh -source $HELPER_SCRIPTS/invoke-tests.sh # Install the AWS CLI v1 on Ubuntu16 and Ubuntu18, and AWS CLI v2 on Ubuntu20 if isUbuntu20 ; then diff --git a/images/linux/scripts/installers/azcopy.sh b/images/linux/scripts/installers/azcopy.sh index d8c4d7a3..0e6ccd53 100644 --- a/images/linux/scripts/installers/azcopy.sh +++ b/images/linux/scripts/installers/azcopy.sh @@ -4,7 +4,6 @@ ## Desc: Installs AzCopy ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install AzCopy7 wget -O azcopy.tar.gz https://aka.ms/downloadazcopylinux64 diff --git a/images/linux/scripts/installers/azure-cli.sh b/images/linux/scripts/installers/azure-cli.sh index 0855b954..c666eff5 100644 --- a/images/linux/scripts/installers/azure-cli.sh +++ b/images/linux/scripts/installers/azure-cli.sh @@ -4,7 +4,6 @@ ## Desc: Installed Azure CLI (az) ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash diff --git a/images/linux/scripts/installers/azure-devops-cli.sh b/images/linux/scripts/installers/azure-devops-cli.sh index 81d9d899..a4dd672f 100644 --- a/images/linux/scripts/installers/azure-devops-cli.sh +++ b/images/linux/scripts/installers/azure-devops-cli.sh @@ -4,7 +4,6 @@ ## Desc: Installed Azure DevOps CLI (az devops) ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # AZURE_EXTENSION_DIR shell variable defines where modules are installed # https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview diff --git a/images/linux/scripts/installers/bazel.sh b/images/linux/scripts/installers/bazel.sh index 1108c468..4cba7bed 100644 --- a/images/linux/scripts/installers/bazel.sh +++ b/images/linux/scripts/installers/bazel.sh @@ -4,7 +4,6 @@ ## Desc: Installs Bazel and Bazelisk (A user-friendly launcher for Bazel) ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install bazel curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add - diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 0cb73f83..287da386 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -6,7 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh -source $HELPER_SCRIPTS/invoke-tests.sh function InstallClang { local version=$1 diff --git a/images/linux/scripts/installers/cleanup.sh b/images/linux/scripts/installers/cleanup.sh index 32a083f9..93be919b 100644 --- a/images/linux/scripts/installers/cleanup.sh +++ b/images/linux/scripts/installers/cleanup.sh @@ -28,3 +28,6 @@ after=$(df / -Pm | awk 'NR==2{print $4}') echo "Before: $before MB" echo "After : $after MB" echo "Delta : $(($after-$before)) MB" + +# delete symlink for tests running +rm -f /usr/local/bin/invoke_tests \ No newline at end of file diff --git a/images/linux/scripts/installers/cmake.sh b/images/linux/scripts/installers/cmake.sh index 6f6a6ed1..7b2e86c0 100644 --- a/images/linux/scripts/installers/cmake.sh +++ b/images/linux/scripts/installers/cmake.sh @@ -4,7 +4,6 @@ ## Desc: Installs CMake ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Test to see if the software in question is already installed, if not install it echo "Checking to see if the installer script has already been run" diff --git a/images/linux/scripts/installers/configure-environment.sh b/images/linux/scripts/installers/configure-environment.sh index 97d3c606..9ce7fe9f 100644 --- a/images/linux/scripts/installers/configure-environment.sh +++ b/images/linux/scripts/installers/configure-environment.sh @@ -25,3 +25,7 @@ chmod -R 777 $AGENT_TOOLSDIRECTORY # https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html # https://www.suse.com/support/kb/doc/?id=000016692 echo 'vm.max_map_count=262144' | tee -a /etc/sysctl.conf + +# Create symlink for tests running +chmod +x $HELPER_SCRIPTS/invoke-tests.sh +ln -s $HELPER_SCRIPTS/invoke-tests.sh /usr/local/bin/invoke_tests \ No newline at end of file diff --git a/images/linux/scripts/installers/docker-compose.sh b/images/linux/scripts/installers/docker-compose.sh index bc335eda..1ae8225e 100644 --- a/images/linux/scripts/installers/docker-compose.sh +++ b/images/linux/scripts/installers/docker-compose.sh @@ -4,7 +4,6 @@ ## Desc: Installs Docker Compose ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install latest docker-compose from releases URL=$(curl -s https://api.github.com/repos/docker/compose/releases/latest | jq -r '.assets[].browser_download_url | select(contains("docker-compose-Linux-x86_64"))' | head -1) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index c5c78353..87478a7d 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -6,7 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/invoke-tests.sh # Check to see if docker is already installed docker_package=moby diff --git a/images/linux/scripts/installers/erlang.sh b/images/linux/scripts/installers/erlang.sh index 24f855e7..c3f60856 100644 --- a/images/linux/scripts/installers/erlang.sh +++ b/images/linux/scripts/installers/erlang.sh @@ -4,7 +4,6 @@ ## Desc: Installs erlang ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh source_list=/etc/apt/sources.list.d/eslerlang.list diff --git a/images/linux/scripts/installers/firefox.sh b/images/linux/scripts/installers/firefox.sh index dcedb798..6c4c6c28 100644 --- a/images/linux/scripts/installers/firefox.sh +++ b/images/linux/scripts/installers/firefox.sh @@ -4,8 +4,6 @@ ## Desc: Installs Firefox ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh - # Install Firefox apt-get install -y firefox diff --git a/images/linux/scripts/installers/gcc.sh b/images/linux/scripts/installers/gcc.sh index 67767ff1..690a70c3 100644 --- a/images/linux/scripts/installers/gcc.sh +++ b/images/linux/scripts/installers/gcc.sh @@ -6,7 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh -source $HELPER_SCRIPTS/invoke-tests.sh function InstallGcc { version=$1 diff --git a/images/linux/scripts/installers/gfortran.sh b/images/linux/scripts/installers/gfortran.sh index 84080c55..dfc21523 100644 --- a/images/linux/scripts/installers/gfortran.sh +++ b/images/linux/scripts/installers/gfortran.sh @@ -5,7 +5,6 @@ ################################################################################ source $HELPER_SCRIPTS/os.sh -source $HELPER_SCRIPTS/invoke-tests.sh function InstallFortran { version=$1 diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index 74d03b01..316fa08a 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -6,7 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/invoke-tests.sh ## Install git add-apt-repository ppa:git-core/ppa -y diff --git a/images/linux/scripts/installers/github-cli.sh b/images/linux/scripts/installers/github-cli.sh index 6b410d12..02eef665 100644 --- a/images/linux/scripts/installers/github-cli.sh +++ b/images/linux/scripts/installers/github-cli.sh @@ -5,7 +5,6 @@ ## Must be run as non-root user after homebrew ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install GitHub CLI url=$(curl -s https://api.github.com/repos/cli/cli/releases/latest | jq -r '.assets[].browser_download_url|select(contains("linux") and contains("amd64") and contains(".deb"))') diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index ba3c54eb..6d117055 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -4,7 +4,6 @@ ## Desc: Installs google-chrome and chromedriver ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh LSB_RELEASE=$(lsb_release -rs) diff --git a/images/linux/scripts/installers/google-cloud-sdk.sh b/images/linux/scripts/installers/google-cloud-sdk.sh index 19b8fc68..6c8390ed 100644 --- a/images/linux/scripts/installers/google-cloud-sdk.sh +++ b/images/linux/scripts/installers/google-cloud-sdk.sh @@ -4,7 +4,6 @@ ## Desc: Installs the Google Cloud SDK ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install the Google Cloud SDK echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 24fd6091..4bb12357 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -6,7 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/etc-environment.sh -source $HELPER_SCRIPTS/invoke-tests.sh # Install Herbert V. Riedel's PPA for managing multiple version of ghc on ubuntu. # https://launchpad.net/~hvr/+archive/ubuntu/ghc diff --git a/images/linux/scripts/installers/heroku.sh b/images/linux/scripts/installers/heroku.sh index 12511b90..e720e0f8 100644 --- a/images/linux/scripts/installers/heroku.sh +++ b/images/linux/scripts/installers/heroku.sh @@ -4,7 +4,6 @@ ## Desc: Installs Heroku CLI ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install Heroku CLI curl https://cli-assets.heroku.com/install-ubuntu.sh | sh diff --git a/images/linux/scripts/installers/hhvm.sh b/images/linux/scripts/installers/hhvm.sh index 24183d3b..27e3aab1 100644 --- a/images/linux/scripts/installers/hhvm.sh +++ b/images/linux/scripts/installers/hhvm.sh @@ -4,7 +4,6 @@ ## Desc: Installs hhvm ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94 add-apt-repository https://dl.hhvm.com/ubuntu diff --git a/images/linux/scripts/installers/homebrew.sh b/images/linux/scripts/installers/homebrew.sh index 5db00d99..c065f3d9 100644 --- a/images/linux/scripts/installers/homebrew.sh +++ b/images/linux/scripts/installers/homebrew.sh @@ -7,7 +7,6 @@ # Source the helpers source $HELPER_SCRIPTS/etc-environment.sh -source $HELPER_SCRIPTS/invoke-tests.sh # Install the Homebrew on Linux /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" diff --git a/images/linux/scripts/installers/julia.sh b/images/linux/scripts/installers/julia.sh index 5793efb5..c947ce7b 100644 --- a/images/linux/scripts/installers/julia.sh +++ b/images/linux/scripts/installers/julia.sh @@ -4,7 +4,6 @@ ## Desc: Installs Julia, and adds Julia to the path ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # This function fetches the latest Julia release from the GitHub API # Based on https://gist.github.com/lukechilds/a83e1d7127b78fef38c2914c4ececc3c diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/linux/scripts/installers/kubernetes-tools.sh index 685e25fb..0a3a8d78 100644 --- a/images/linux/scripts/installers/kubernetes-tools.sh +++ b/images/linux/scripts/installers/kubernetes-tools.sh @@ -4,7 +4,6 @@ ## Desc: Installs kubectl, helm, kustomize ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install KIND URL=$(curl -s https://api.github.com/repos/kubernetes-sigs/kind/releases/latest | jq -r '.assets[].browser_download_url | select(contains("kind-linux-amd64"))') diff --git a/images/linux/scripts/installers/leiningen.sh b/images/linux/scripts/installers/leiningen.sh index 7919513f..87a5059a 100644 --- a/images/linux/scripts/installers/leiningen.sh +++ b/images/linux/scripts/installers/leiningen.sh @@ -4,7 +4,6 @@ ## Desc: Installs Leiningen ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh LEIN_BIN=/usr/local/bin/lein curl -s https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein > $LEIN_BIN diff --git a/images/linux/scripts/installers/mercurial.sh b/images/linux/scripts/installers/mercurial.sh index b04ffa92..9024803f 100644 --- a/images/linux/scripts/installers/mercurial.sh +++ b/images/linux/scripts/installers/mercurial.sh @@ -4,7 +4,6 @@ ## Desc: Installs Mercurial ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh diff --git a/images/linux/scripts/installers/miniconda.sh b/images/linux/scripts/installers/miniconda.sh index 95d1ef9e..7a3c3c99 100644 --- a/images/linux/scripts/installers/miniconda.sh +++ b/images/linux/scripts/installers/miniconda.sh @@ -4,7 +4,6 @@ ## Desc: Installs miniconda ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install Miniconda curl -sL https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh \ diff --git a/images/linux/scripts/installers/mono.sh b/images/linux/scripts/installers/mono.sh index f4481c1c..5e1dc48d 100644 --- a/images/linux/scripts/installers/mono.sh +++ b/images/linux/scripts/installers/mono.sh @@ -4,7 +4,6 @@ ## Desc: Installs Mono ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh LSB_CODENAME=$(lsb_release -cs) diff --git a/images/linux/scripts/installers/mssql-cmd-tools.sh b/images/linux/scripts/installers/mssql-cmd-tools.sh index 9461121b..25a86467 100644 --- a/images/linux/scripts/installers/mssql-cmd-tools.sh +++ b/images/linux/scripts/installers/mssql-cmd-tools.sh @@ -4,7 +4,6 @@ ## Desc: Install MS SQL Server client tools (https://docs.microsoft.com/en-us/sql/linux/sql-server-linux-setup-tools?view=sql-server-2017) ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh export ACCEPT_EULA=Y diff --git a/images/linux/scripts/installers/netlify.sh b/images/linux/scripts/installers/netlify.sh index 8f0de592..d939b270 100644 --- a/images/linux/scripts/installers/netlify.sh +++ b/images/linux/scripts/installers/netlify.sh @@ -4,7 +4,6 @@ ## Desc: Installs the Netlify CLI ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install the Netlify CLI npm i -g netlify-cli diff --git a/images/linux/scripts/installers/oc.sh b/images/linux/scripts/installers/oc.sh index d11f6573..8330f12f 100644 --- a/images/linux/scripts/installers/oc.sh +++ b/images/linux/scripts/installers/oc.sh @@ -5,7 +5,6 @@ ################################################################################ source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/invoke-tests.sh # Install the oc CLI DOWNLOAD_URL="https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz" diff --git a/images/linux/scripts/installers/oras-cli.sh b/images/linux/scripts/installers/oras-cli.sh index 76d48b6b..e61d3a8a 100644 --- a/images/linux/scripts/installers/oras-cli.sh +++ b/images/linux/scripts/installers/oras-cli.sh @@ -5,7 +5,6 @@ ################################################################################ source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/invoke-tests.sh # Determine latest ORAS CLI version ORAS_CLI_LATEST_VERSION_URL=https://api.github.com/repos/deislabs/oras/releases/latest diff --git a/images/linux/scripts/installers/packer.sh b/images/linux/scripts/installers/packer.sh index 5fe11688..b4ab06bf 100644 --- a/images/linux/scripts/installers/packer.sh +++ b/images/linux/scripts/installers/packer.sh @@ -4,7 +4,6 @@ ## Desc: Installs packer ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install Packer PACKER_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | jq -r .current_version) diff --git a/images/linux/scripts/installers/phantomjs.sh b/images/linux/scripts/installers/phantomjs.sh index 2207f637..c9764413 100644 --- a/images/linux/scripts/installers/phantomjs.sh +++ b/images/linux/scripts/installers/phantomjs.sh @@ -4,7 +4,6 @@ ## Desc: Installs PhantomJS ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install PhantomJS apt-get install -y chrpath libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index b54b4379..a102c545 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -7,7 +7,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/etc-environment.sh source $HELPER_SCRIPTS/os.sh -source $HELPER_SCRIPTS/invoke-tests.sh # add repository apt-add-repository ppa:ondrej/php -y diff --git a/images/linux/scripts/installers/pipx-packages.sh b/images/linux/scripts/installers/pipx-packages.sh index a7442b89..a44a887d 100644 --- a/images/linux/scripts/installers/pipx-packages.sh +++ b/images/linux/scripts/installers/pipx-packages.sh @@ -4,7 +4,6 @@ ## Desc: Install tools via pipx ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh export PATH="$PATH:/opt/pipx_bin" diff --git a/images/linux/scripts/installers/pollinate.sh b/images/linux/scripts/installers/pollinate.sh index 96fb893b..29699fac 100644 --- a/images/linux/scripts/installers/pollinate.sh +++ b/images/linux/scripts/installers/pollinate.sh @@ -4,7 +4,6 @@ ## Desc: Installs Pollinate ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install Pollinate apt-get install -y --no-install-recommends pollinate diff --git a/images/linux/scripts/installers/pulumi.sh b/images/linux/scripts/installers/pulumi.sh index 4c6934c3..12d5f9ce 100644 --- a/images/linux/scripts/installers/pulumi.sh +++ b/images/linux/scripts/installers/pulumi.sh @@ -6,7 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/invoke-tests.sh # Install Pulumi VERSION=$(curl --fail --silent -L "https://www.pulumi.com/latest-version") diff --git a/images/linux/scripts/installers/r.sh b/images/linux/scripts/installers/r.sh index 3015090c..ee23b3c4 100644 --- a/images/linux/scripts/installers/r.sh +++ b/images/linux/scripts/installers/r.sh @@ -2,7 +2,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh -source $HELPER_SCRIPTS/invoke-tests.sh # install R osLabel=$(getOSVersionLabel) diff --git a/images/linux/scripts/installers/rndgenerator.sh b/images/linux/scripts/installers/rndgenerator.sh index ecc8626c..63a5d06a 100644 --- a/images/linux/scripts/installers/rndgenerator.sh +++ b/images/linux/scripts/installers/rndgenerator.sh @@ -4,7 +4,6 @@ ## Desc: Install random number generator ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install haveged apt-get -y install haveged diff --git a/images/linux/scripts/installers/rust.sh b/images/linux/scripts/installers/rust.sh index f848fd20..b3e2a4d6 100644 --- a/images/linux/scripts/installers/rust.sh +++ b/images/linux/scripts/installers/rust.sh @@ -6,7 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/etc-environment.sh -source $HELPER_SCRIPTS/invoke-tests.sh export RUSTUP_HOME=/usr/share/rust/.rustup export CARGO_HOME=/usr/share/rust/.cargo diff --git a/images/linux/scripts/installers/sbt.sh b/images/linux/scripts/installers/sbt.sh index 9f45f28f..9cb4b65f 100644 --- a/images/linux/scripts/installers/sbt.sh +++ b/images/linux/scripts/installers/sbt.sh @@ -4,7 +4,6 @@ ## Desc: Installs sbt ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install sbt # https://www.scala-sbt.org/1.x/docs/Installing-sbt-on-Linux.html diff --git a/images/linux/scripts/installers/selenium.sh b/images/linux/scripts/installers/selenium.sh index 43c07ebe..4ce3fa24 100644 --- a/images/linux/scripts/installers/selenium.sh +++ b/images/linux/scripts/installers/selenium.sh @@ -4,7 +4,6 @@ ## Desc: Installs selenium server ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Determine latest selenium standalone server version SELENIUM_LATEST_VERSION_URL=https://api.github.com/repos/SeleniumHQ/selenium/releases/latest diff --git a/images/linux/scripts/installers/sphinx.sh b/images/linux/scripts/installers/sphinx.sh index cfaeb0af..d81d9303 100644 --- a/images/linux/scripts/installers/sphinx.sh +++ b/images/linux/scripts/installers/sphinx.sh @@ -4,7 +4,6 @@ ## Desc: Installs Sphinx ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install Sphinx apt-get install -y sphinxsearch diff --git a/images/linux/scripts/installers/subversion.sh b/images/linux/scripts/installers/subversion.sh index efc2551d..5156b530 100644 --- a/images/linux/scripts/installers/subversion.sh +++ b/images/linux/scripts/installers/subversion.sh @@ -4,7 +4,6 @@ ## Desc: Installs Subversion client ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install Subversion apt-get install -y --no-install-recommends subversion diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh index 7b6dccea..780b0836 100644 --- a/images/linux/scripts/installers/swift.sh +++ b/images/linux/scripts/installers/swift.sh @@ -4,7 +4,6 @@ ## Desc: Installs Swift ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install image_label="$(lsb_release -rs)" diff --git a/images/linux/scripts/installers/swig.sh b/images/linux/scripts/installers/swig.sh index 30c0a5c0..893720fa 100644 --- a/images/linux/scripts/installers/swig.sh +++ b/images/linux/scripts/installers/swig.sh @@ -1,6 +1,5 @@ #!/bin/bash -e -source $HELPER_SCRIPTS/invoke-tests.sh # Install Swig sudo apt-get install -y swig diff --git a/images/linux/scripts/installers/terraform.sh b/images/linux/scripts/installers/terraform.sh index 6361a5dd..febf3baa 100644 --- a/images/linux/scripts/installers/terraform.sh +++ b/images/linux/scripts/installers/terraform.sh @@ -4,7 +4,6 @@ ## Desc: Installs terraform ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install Terraform TERRAFORM_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r .current_version) diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/linux/scripts/installers/vcpkg.sh index e41b8cb9..fd2f7ff3 100644 --- a/images/linux/scripts/installers/vcpkg.sh +++ b/images/linux/scripts/installers/vcpkg.sh @@ -6,7 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh -source $HELPER_SCRIPTS/invoke-tests.sh # Set env variable for vcpkg VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg diff --git a/images/linux/scripts/installers/vercel.sh b/images/linux/scripts/installers/vercel.sh index 7fda65df..a4f0a8c9 100644 --- a/images/linux/scripts/installers/vercel.sh +++ b/images/linux/scripts/installers/vercel.sh @@ -4,7 +4,6 @@ ## Desc: Installs the Vercel CLI ################################################################################ -source $HELPER_SCRIPTS/invoke-tests.sh # Install the Vercel CLI npm i -g vercel diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 08e56cfc..4d7c870e 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -132,7 +132,8 @@ ], "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", - "IMAGE_OS={{user `image_os`}}" + "IMAGE_OS={{user `image_os`}}", + "HELPER_SCRIPTS={{user `helper_script_folder`}}" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index a1d0ebbd..ebbdbc0a 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -135,7 +135,8 @@ ], "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", - "IMAGE_OS={{user `image_os`}}" + "IMAGE_OS={{user `image_os`}}", + "HELPER_SCRIPTS={{user `helper_script_folder`}}" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 84957d4e..21adb5f9 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -135,7 +135,8 @@ ], "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", - "IMAGE_OS={{user `image_os`}}" + "IMAGE_OS={{user `image_os`}}", + "HELPER_SCRIPTS={{user `helper_script_folder`}}" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" },