Skip to content

Commit a60cb4f

Browse files
ycliuhwycliuhw
committed
Merge branch '2.8' into Merge-2.8
2 parents 716e288 + cff0719 commit a60cb4f

File tree

6 files changed

+39
-23
lines changed

6 files changed

+39
-23
lines changed

‎.github/workflows/microk8s-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ jobs:
8383
set -eux
8484
git clone https://github.com/juju-solutions/bundle-kubeflow.git
8585
cd bundle-kubeflow
86+
# TODO: tmp fix, remove me later once current kubeflow master branch published.
87+
git reset --hard 5e0b6fcb
8688
git clone git://git.launchpad.net/canonical-osm
8789
cp -r canonical-osm/charms/interfaces/juju-relation-mysql mysql
8890

‎acceptancetests/assess_caas_deploy_kubeflow.py

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,24 @@
1010
from __future__ import print_function
1111

1212
import argparse
13+
import contextlib
1314
import json
1415
import logging
15-
import contextlib
1616
import os
1717
import shutil
18-
import time
18+
import subprocess
1919
import sys
2020
import textwrap
21-
import subprocess
21+
import time
2222
from pprint import pformat
2323
from time import sleep
2424

2525
from deploy_stack import BootstrapManager
26+
from jujupy.k8s_provider import K8sProviderType, providers
27+
from jujupy.utility import until_timeout
2628
from utility import (
2729
JujuAssertionError, add_basic_testing_arguments, configure_logging,
2830
)
29-
from jujupy.k8s_provider import K8sProviderType, providers
30-
from jujupy.utility import until_timeout
31-
3231

3332
__metaclass__ = type
3433
log = logging.getLogger("assess_caas_kubeflow_deployment")
@@ -295,6 +294,16 @@ def get_pub_addr(caas_client, model_name):
295294

296295

297296
def prepare(caas_client, caas_provider, build):
297+
298+
for dep in [
299+
"charm",
300+
"juju-helpers",
301+
"juju-wait",
302+
]:
303+
if shutil.which(dep):
304+
continue
305+
caas_client.sh('sudo', 'snap', 'install', dep, '--classic')
306+
298307
if caas_provider == K8sProviderType.MICROK8S.name:
299308
caas_client.enable_microk8s_addons(
300309
[
@@ -307,15 +316,6 @@ def prepare(caas_client, caas_provider, build):
307316
"-nkube-system", "deployment/coredns", "deployment/hostpath-provisioner", "--timeout=10m",
308317
)
309318

310-
for dep in [
311-
"charm",
312-
"juju-helpers",
313-
"juju-wait",
314-
]:
315-
if shutil.which(dep):
316-
continue
317-
caas_client.sh('sudo', 'snap', 'install', dep, '--classic')
318-
319319
caas_client.sh('sudo', 'apt', 'update')
320320
caas_client.sh('sudo', 'apt', 'install', '-y', 'libssl-dev', 'python3-setuptools')
321321

@@ -340,7 +340,7 @@ def prepare(caas_client, caas_provider, build):
340340
)
341341

342342

343-
def run_test(caas_provider, k8s_model, bundle, build):
343+
def run_test(caas_provider, caas_client, k8s_model, bundle, build):
344344
if caas_provider != K8sProviderType.MICROK8S.name:
345345
# tests/run.sh only works for microk8s.
346346
log.info("%s/tests/run.sh is skipped for %s k8s provider", KUBEFLOW_DIR, caas_provider)
@@ -352,6 +352,10 @@ def run_test(caas_provider, k8s_model, bundle, build):
352352
os.environ['JUJU_DATA'] = k8s_model.env.juju_home
353353

354354
with jump_dir(KUBEFLOW_DIR):
355+
if not build:
356+
# TODO: tmp fix, remove me later once current kubeflow master branch published.
357+
caas_client.sh('git', 'reset', '--hard', '5e0b6fcb')
358+
355359
run("sg", "microk8s", "-c", f"{KUBEFLOW_DIR}/tests/run.sh -m {bundle}")
356360

357361

@@ -416,7 +420,7 @@ def fail_hook():
416420
log.info("sleeping for 30 seconds to let everything start up")
417421
sleep(30)
418422

419-
run_test(caas_provider, k8s_model, bundle, build)
423+
run_test(caas_provider, caas_client, k8s_model, bundle, build)
420424
k8s_model.juju(k8s_model._show_status, ('--format', 'tabular'))
421425
success_hook()
422426
except: # noqa: E722

‎api/migrationmaster/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ func (c *Client) MinionReportTimeout() (time.Duration, error) {
285285
var timeout time.Duration
286286

287287
var res params.StringResult
288-
err := c.caller.FacadeCall("MinionReports", nil, &res)
288+
err := c.caller.FacadeCall("MinionReportTimeout", nil, &res)
289289
if err != nil {
290290
return timeout, errors.Trace(err)
291291
}

‎api/migrationmaster/client_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,10 @@ func (s *ClientSuite) TestMinionReportsBadFailedTag(c *gc.C) {
553553
}
554554

555555
func (s *ClientSuite) TestMinionReportTimeout(c *gc.C) {
556-
apiCaller := apitesting.APICallerFunc(func(_ string, _ int, _ string, _ string, _ interface{}, result interface{}) error {
556+
apiCaller := apitesting.APICallerFunc(func(facade string, _ int, _, method string, _ interface{}, result interface{}) error {
557+
c.Assert(facade, gc.Equals, "MigrationMaster")
558+
c.Assert(method, gc.Equals, "MinionReportTimeout")
559+
557560
out := result.(*params.StringResult)
558561
*out = params.StringResult{
559562
Result: "30s",

‎core/series/supportedseries.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ func seriesForTypes(path string, now time.Time, requestedSeries, imageStream str
7171
// after reading the `/usr/share/distro-info/ubuntu.csv` on the Ubuntu distro
7272
// the non-LTS should disappear if they're not in the release window for that
7373
// series.
74+
seriesVersionsMutex.Lock()
75+
defer seriesVersionsMutex.Unlock()
7476
composeSeriesVersions()
7577
if requestedSeries != "" && imageStream == Daily {
7678
setSupported(allSeriesVersions, requestedSeries)

‎environs/sync/sync_test.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"sort"
2020
"testing"
2121

22+
"github.com/juju/collections/set"
2223
"github.com/juju/errors"
2324
jujuhttp "github.com/juju/http"
2425
"github.com/juju/os/v2/series"
@@ -269,12 +270,14 @@ func (s *uploadSuite) TestUpload(c *gc.C) {
269270
func (s *uploadSuite) TestUploadFakeSeries(c *gc.C) {
270271
s.patchBundleTools(c, nil)
271272
seriesToUpload := "xenial"
272-
if seriesToUpload == coretesting.HostSeries(c) {
273+
hostSeries := coretesting.HostSeries(c)
274+
if seriesToUpload == hostSeries {
273275
seriesToUpload = "raring"
274276
}
275277
t, err := sync.Upload(s.targetStorage, "released", nil, "bionic", seriesToUpload)
276278
c.Assert(err, jc.ErrorIsNil)
277-
s.assertUploadedTools(c, t, []string{seriesToUpload, "bionic", coretesting.HostSeries(c)}, "released")
279+
expectedSeries := set.NewStrings(seriesToUpload, "bionic", hostSeries)
280+
s.assertUploadedTools(c, t, expectedSeries.Values(), "released")
278281
}
279282

280283
func (s *uploadSuite) TestUploadAndForceVersion(c *gc.C) {
@@ -299,15 +302,17 @@ func (s *uploadSuite) TestSyncTools(c *gc.C) {
299302
func (s *uploadSuite) TestSyncToolsFakeSeries(c *gc.C) {
300303
s.patchBundleTools(c, nil)
301304
seriesToUpload := "xenial"
302-
if seriesToUpload == coretesting.HostSeries(c) {
305+
hostSeries := coretesting.HostSeries(c)
306+
if seriesToUpload == hostSeries {
303307
seriesToUpload = "raring"
304308
}
305309
builtTools, err := sync.BuildAgentTarball(true, nil, "testing")
306310
c.Assert(err, jc.ErrorIsNil)
307311

308312
t, err := sync.SyncBuiltTools(s.targetStorage, "testing", builtTools, "bionic", seriesToUpload)
309313
c.Assert(err, jc.ErrorIsNil)
310-
s.assertUploadedTools(c, t, []string{seriesToUpload, "bionic", coretesting.HostSeries(c)}, "testing")
314+
expectedSeries := set.NewStrings(seriesToUpload, "bionic", hostSeries)
315+
s.assertUploadedTools(c, t, expectedSeries.Values(), "testing")
311316
}
312317

313318
func (s *uploadSuite) TestSyncAndForceVersion(c *gc.C) {

0 commit comments

Comments
 (0)