diff options
| author | John <john.mccrae@progress.com> | 2023-03-24 12:47:02 -0700 |
|---|---|---|
| committer | John <john.mccrae@progress.com> | 2023-03-24 12:47:02 -0700 |
| commit | 7b7694caf5b362aabc396a95e2525e007386e65a (patch) | |
| tree | c7676bbb3674f6f68a4c8183a2f81ba9bb9e03c6 | |
| parent | 3a50fd4af10ab2ad23720ba9e0094c28b4b8c415 (diff) | |
| download | chef-7b7694caf5b362aabc396a95e2525e007386e65a.tar.gz | |
Moved bash code to file as it wasn't executing properly in yml
Signed-off-by: John <john.mccrae@progress.com>
| -rw-r--r-- | .expeditor/habitat-test.pipeline.yml | 12 | ||||
| -rwxr-xr-x | .expeditor/scripts/habitat-preplinux.sh | 8 | ||||
| -rwxr-xr-x | .expeditor/scripts/habitat-preplinux2.sh | 7 | ||||
| -rw-r--r-- | .expeditor/scripts/habitat-test.ps1 | 1 |
4 files changed, 18 insertions, 10 deletions
diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml index dcc311ad14..86ebe4c492 100644 --- a/.expeditor/habitat-test.pipeline.yml +++ b/.expeditor/habitat-test.pipeline.yml @@ -11,11 +11,7 @@ steps: - label: ":linux: Validate Linux" commands: - - export EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX="chef/chef-infra-client/18.2.0/20230323102446" - - sudo ./.expeditor/scripts/install-hab.sh x86_64-linux - - echo "--- Installing $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX" - - sudo hab pkg install $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX - - sudo ./habitat/tests/test.sh $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX + - ./.expeditor/scripts/habitat-preplinux.sh expeditor: executor: linux: @@ -24,11 +20,7 @@ steps: - label: ":linux: Validate Linux (kernel2)" commands: - - export EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX="chef/chef-infra-client/18.2.0/20230323102435" - - sudo ./.expeditor/scripts/install-hab.sh x86_64-linux-kernel2 - - echo "--- Installing $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUXKERNEL2" - - sudo hab pkg install $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUXKERNEL2 - - sudo ./habitat/tests/test.sh $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUXKERNEL2 + - ./.expeditor/scripts/habitat-preplinux2.sh expeditor: executor: linux: diff --git a/.expeditor/scripts/habitat-preplinux.sh b/.expeditor/scripts/habitat-preplinux.sh new file mode 100755 index 0000000000..e46ddb1dc1 --- /dev/null +++ b/.expeditor/scripts/habitat-preplinux.sh @@ -0,0 +1,8 @@ + #!/usr/bin/env bash + + export EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX="chef/chef-infra-client/18.2.0/20230323102446" + sudo ./.expeditor/scripts/install-hab.sh x86_64-linux + echo "--- Installing $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX" + sudo hab pkg install $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX + sudo ./habitat/tests/test.sh $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX +
\ No newline at end of file diff --git a/.expeditor/scripts/habitat-preplinux2.sh b/.expeditor/scripts/habitat-preplinux2.sh new file mode 100755 index 0000000000..becc3fb8a2 --- /dev/null +++ b/.expeditor/scripts/habitat-preplinux2.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +export EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX="chef/chef-infra-client/18.2.0/20230323102435" +sudo ./.expeditor/scripts/install-hab.sh x86_64-linux-kernel2 +echo "--- Installing $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUXKERNEL2" +sudo hab pkg install $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUXKERNEL2 +sudo ./habitat/tests/test.sh $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUXKERNEL2 diff --git a/.expeditor/scripts/habitat-test.ps1 b/.expeditor/scripts/habitat-test.ps1 index 49f070dad4..8c8ff0370c 100644 --- a/.expeditor/scripts/habitat-test.ps1 +++ b/.expeditor/scripts/habitat-test.ps1 @@ -5,5 +5,6 @@ $ScriptRoute = [System.IO.Path]::GetFullPath([System.IO.Path]::Combine($PSScript # . ./scripts/ensure-minimum-viable-hab.ps1 Write-Host "--- Installing $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS" $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") +Set-Variable -Name EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS -Value "chef/chef-infra-client" hab pkg install $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS . ./habitat/tests/test.ps1 -PackageIdentifier $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS |