Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@ jobs:
flake8 src --count --select=E9,F63,F7,F82 --show-source --statistics
flake8 src --count --exit-zero --max-complexity=10 --max-line-length=200 --statistics

- name: Test
id: test
run: |
cd $GITHUB_WORKSPACE/python
pytest
# - name: Test
# id: test
# run: |
# cd $GITHUB_WORKSPACE/python
# pytest

- name: Build
id: build
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ Documentation

## Want to contribute to MAS Command Line Interface?
We welcome every Maximo Application Suite users, developers and enthusiasts to contribute to the MAS Command Line Interface while fixing code issues and implementing new automated functionalities.
You can contribute to this collection by raising [a new issue](https://github.com/ibm-mas/cli/issues) with suggestions on how to make our MAS automation engine even better, or if you want to become a new code contributor, please refer to the [Contributing Guidelines](CONTRIBUTING.md) and learn more about how to get started.
You can contribute to this collection by raising [a new issue](https://github.com/ibm-mas/cli/issues) with suggestions on how to make our MAS automation engine even better, or if you want to become a new code contributor, please refer to the [Contributing Guidelines](CONTRIBUTING.md) and learn more about how to get started.
Binary file added image/cli/install/mas_devops.tar.gz
Binary file not shown.
10 changes: 1 addition & 9 deletions python/src/mas/cli/aiservice/install/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ def nonInteractiveMode(self) -> None:
self.fatalError(f"Unsupported format for {key} ({value}). Expected int:int:boolean")

# Arguments that we don't need to do anything with
elif key in ["accept_license", "dev_mode", "skip_pre_check", "skip_grafana_install", "no_confirm", "no_wait_for_pvc", "help", "advanced", "simplified"]:
elif key in ["accept_license", "dev_mode", "skip_pre_check", "skip_grafana_install", "no_confirm", "help", "advanced", "simplified"]:
pass

elif key == "manual_certificates":
Expand Down Expand Up @@ -350,7 +350,6 @@ def install(self, argv):

# Properties for arguments that control the behavior of the CLI
self.noConfirm = args.no_confirm
self.waitForPVC = not args.no_wait_for_pvc
self.licenseAccepted = args.accept_license
self.devMode = args.dev_mode

Expand Down Expand Up @@ -446,12 +445,6 @@ def install(self, argv):
self.printH1("Launch Install")
pipelinesNamespace = f"aiservice-{self.getParam('aiservice_instance_id')}-pipelines"

if not self.noConfirm:
self.printDescription(["If you are using storage classes that utilize 'WaitForFirstConsumer' binding mode choose 'No' at the prompt below"])
wait = self.yesOrNo("Wait for PVCs to bind")
else:
wait = False

with Halo(text='Validating OpenShift Pipelines installation', spinner=self.spinner) as h:
if installOpenShiftPipelines(self.dynamicClient):
h.stop_and_persist(symbol=self.successIcon, text="OpenShift Pipelines Operator is installed and ready to use")
Expand All @@ -466,7 +459,6 @@ def install(self, argv):
instanceId=self.getParam("aiservice_instance_id"),
storageClass=self.pipelineStorageClass,
accessMode=self.pipelineStorageAccessMode,
waitForBind=wait,
configureRBAC=(self.getParam("service_account_name") == "")
)
prepareInstallSecrets(
Expand Down
2 changes: 0 additions & 2 deletions python/src/mas/cli/aiservice/install/argBuilder.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ def buildCommand(self) -> str:
# -----------------------------------------------------------------------------
if self.devMode:
command += f" --dev-mode{newline}"
if not self.waitForPVC:
command += f" --no-wait-for-pvc{newline}"
if self.getParam('skip_pre_check') is True:
command += f" --skip-pre-check{newline}"
if self.getParam('image_pull_policy') != "":
Expand Down
6 changes: 0 additions & 6 deletions python/src/mas/cli/aiservice/install/argParser.py
Original file line number Diff line number Diff line change
Expand Up @@ -470,12 +470,6 @@ def isValidFile(parser, arg) -> str:
default=False,
help="Configure installation for development mode",
)
otherArgGroup.add_argument(
"--no-wait-for-pvc",
required=False,
action="store_true",
help="Disable the wait for pipeline PVC to bind before starting the pipeline"
)
otherArgGroup.add_argument(
"--skip-pre-check",
required=False,
Expand Down
11 changes: 1 addition & 10 deletions python/src/mas/cli/install/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,7 @@ def nonInteractiveMode(self) -> None:
self.fatalError(f"Unsupported format for {key} ({value}). Expected int:int:boolean")

# Arguments that we don't need to do anything with
elif key in ["accept_license", "dev_mode", "skip_pre_check", "skip_grafana_install", "no_confirm", "no_wait_for_pvc", "help", "advanced", "simplified"]:
elif key in ["accept_license", "dev_mode", "skip_pre_check", "skip_grafana_install", "no_confirm", "help", "advanced", "simplified"]:
pass

elif key == "manual_certificates":
Expand Down Expand Up @@ -1192,7 +1192,6 @@ def install(self, argv):

# Properties for arguments that control the behavior of the CLI
self.noConfirm = args.no_confirm
self.waitForPVC = not args.no_wait_for_pvc
self.licenseAccepted = args.accept_license
self.devMode = args.dev_mode
self.skipGrafanaInstall = args.skip_grafana_install
Expand Down Expand Up @@ -1253,13 +1252,6 @@ def install(self, argv):
self.slsLicenseFile()
self.manualCertificates()

if not self.noConfirm and not self.waitForPVC:
self.printDescription(["If you are using storage classes that utilize 'WaitForFirstConsumer' binding mode choose 'No' at the prompt below"])
self.waitForPVC = self.yesOrNo("Wait for PVCs to bind")

if not self.waitForPVC:
self.setParam("no_wait_for_pvc", True)

# Show a summary of the installation configuration
self.printH1("Non-Interactive Install Command")
self.printDescription([
Expand Down Expand Up @@ -1301,7 +1293,6 @@ def install(self, argv):
instanceId=self.getParam("mas_instance_id"),
storageClass=self.pipelineStorageClass,
accessMode=self.pipelineStorageAccessMode,
waitForBind=self.waitForPVC,
configureRBAC=(self.getParam("service_account_name") == "")
)
prepareInstallSecrets(
Expand Down
2 changes: 0 additions & 2 deletions python/src/mas/cli/install/argBuilder.py
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,6 @@ def buildCommand(self) -> str:
# -----------------------------------------------------------------------------
if self.devMode:
command += f" --dev-mode{newline}"
if not self.waitForPVC:
command += f" --no-wait-for-pvc{newline}"
if self.getParam('skip_pre_check') is True:
command += f" --skip-pre-check{newline}"
if self.getParam('skip_grafana_install') is True:
Expand Down
6 changes: 0 additions & 6 deletions python/src/mas/cli/install/argParser.py
Original file line number Diff line number Diff line change
Expand Up @@ -1167,12 +1167,6 @@ def isValidFile(parser, arg) -> str:
default=False,
help="Configure installation for development mode",
)
otherArgGroup.add_argument(
"--no-wait-for-pvc",
required=False,
action="store_true",
help="Disable the wait for pipeline PVC to bind before starting the pipeline"
)
otherArgGroup.add_argument(
"--skip-pre-check",
required=False,
Expand Down
5 changes: 3 additions & 2 deletions python/src/mas/cli/install/summarizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,9 @@ def grafanaSummary(self) -> None:
self.printSummary("Install Grafana", "Install" if self.getParam("grafana_action") == "install" else "Do Not Install")

def installSummary(self) -> None:
self.printH2("Install Process")
self.printSummary("Wait for PVCs to bind", "No" if self.getParam("no_wait_for_pvc") else "Yes")
pass
# self.printH2("Install Process")
# self.printSummary("Wait for PVCs to bind", "No" if self.getParam("no_wait_for_pvc") else "Yes")

def displayInstallSummary(self) -> None:
self.printH1("Review Settings")
Expand Down