diff options
| author | Tim Smith <tsmith@chef.io> | 2021-02-12 20:40:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 20:40:19 -0800 |
| commit | 2a8d93f2def9d412171610242c7bb4ac45bce863 (patch) | |
| tree | bdfde88bacb5e86f8561c676e46f833d292dc336 | |
| parent | 01531f0d868af7cd5377f9c88429bcb427273b11 (diff) | |
| parent | 57440613d302767c26f3ac2d0dc481358d567a54 (diff) | |
| download | chef-2a8d93f2def9d412171610242c7bb4ac45bce863.tar.gz | |
Merge pull request #11037 from chef/hab_rhel6
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .bldr.toml | 1 | ||||
| -rw-r--r-- | .expeditor/habitat-test.pipeline.yml | 12 | ||||
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 11 |
3 files changed, 0 insertions, 24 deletions
diff --git a/.bldr.toml b/.bldr.toml index 438c546484..7c45d57d80 100644 --- a/.bldr.toml +++ b/.bldr.toml @@ -1,6 +1,5 @@ [chef-infra-client] build_targets = [ "x86_64-linux", - "x86_64-linux-kernel2", "x86_64-windows" ] diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml index 859d4eb1f1..22f29162b5 100644 --- a/.expeditor/habitat-test.pipeline.yml +++ b/.expeditor/habitat-test.pipeline.yml @@ -21,18 +21,6 @@ steps: privileged: true single-use: true -- label: ":linux: Validate Linux (kernel2)" - commands: - - sudo ./.expeditor/scripts/install-hab.sh x86_64-linux-kernel2 - - 'echo "--- :hammer_and_wrench: 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: - executor: - linux: - privileged: true - single-use: true - - label: ":windows: Validate Habitat Builds of Chef Infra" commands: - powershell -File ./.expeditor/scripts/ensure-minimum-viable-hab.ps1 diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 661017c0c1..041a5c3269 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -591,17 +591,6 @@ steps: privileged: true single-use: true -- label: ":habicat: Linux plan (kernel2)" - commands: - - sudo ./.expeditor/scripts/install-hab.sh 'x86_64-linux-kernel2' - - sudo ./.expeditor/scripts/verify-plan.sh - timeout_in_minutes: 60 - expeditor: - executor: - linux: - privileged: true - single-use: true - - label: ":habicat: Windows plan" commands: - ./.expeditor/scripts/verify-plan.ps1 |