diff --git a/.drone-pandaria.yml b/.drone-pandaria.yml index d40253efa..acaefc487 100644 --- a/.drone-pandaria.yml +++ b/.drone-pandaria.yml @@ -20,7 +20,7 @@ steps: path: /var/run/docker.sock - name: integration-test - image: rancher/rancher:v2.7-head + image: rancher/rancher:v2.8-head privileged: true commands: - zypper -n install helm @@ -91,7 +91,7 @@ steps: path: /var/run/docker.sock - name: integration-test - image: rancher/rancher:v2.7-head + image: rancher/rancher:v2.8-head privileged: true commands: - zypper -n install helm diff --git a/go.mod b/go.mod index 00935fec6..2abfef22a 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/rancher/dynamiclistener v0.3.5 github.com/rancher/lasso v0.0.0-20230629200414-8a54b32e6792 github.com/rancher/lasso/controller-runtime v0.0.0-20221206162308-10123d5719ad - github.com/rancher/rancher/pkg/apis v0.0.0-20230901132600-5e1ee2611616 + github.com/rancher/rancher/pkg/apis v0.0.0-20230907072751-b6d3cfeb7cce github.com/rancher/rke v1.5.0-rc2 github.com/rancher/wrangler v1.1.1 github.com/sirupsen/logrus v1.9.3 diff --git a/scripts/integration-test b/scripts/integration-test index 943ad8f8a..c04b8046e 100755 --- a/scripts/integration-test +++ b/scripts/integration-test @@ -5,6 +5,9 @@ export CATTLE_DEV_MODE=yes export CATTLE_SERVER_URL="https://$(ip route get 8.8.8.8 | awk '{print $7}'):443" export CATTLE_BOOTSTRAP_PASSWORD="admin" export CATTLE_FEATURES="harvester=false" +export CATTLE_CHART_DEFAULT_BRANCH="dev-v2.8" +export CATTLE_SYSTEM_CHART_DEFAULT_BRANCH="dev-v2.8" +export CATTLE_RANCHER_WEBHOOK_VERSION="103.0.0+up0.4.0-rc3" cd $(dirname $0)/../