diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml index 64caa90759f..604b094838e 100644 --- a/.github/workflows/build-cli.yml +++ b/.github/workflows/build-cli.yml @@ -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 diff --git a/README.md b/README.md index 4698cd92537..9bd91288e1d 100644 --- a/README.md +++ b/README.md @@ -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. \ No newline at end of file +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. diff --git a/python/src/mas/cli/aiservice/install/app.py b/python/src/mas/cli/aiservice/install/app.py index 7bd07eaff93..5032499d3d3 100644 --- a/python/src/mas/cli/aiservice/install/app.py +++ b/python/src/mas/cli/aiservice/install/app.py @@ -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": @@ -349,7 +349,6 @@ def install(self, argv): instanceId = args.aiservice_instance_id # 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 @@ -445,12 +444,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") @@ -465,7 +458,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( diff --git a/python/src/mas/cli/aiservice/install/argBuilder.py b/python/src/mas/cli/aiservice/install/argBuilder.py index 0cd16daf2e8..4af8bcfcc8e 100644 --- a/python/src/mas/cli/aiservice/install/argBuilder.py +++ b/python/src/mas/cli/aiservice/install/argBuilder.py @@ -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') != "": diff --git a/python/src/mas/cli/aiservice/install/argParser.py b/python/src/mas/cli/aiservice/install/argParser.py index bb4c14b4bf5..e99a07b33a7 100644 --- a/python/src/mas/cli/aiservice/install/argParser.py +++ b/python/src/mas/cli/aiservice/install/argParser.py @@ -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, diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py index 6d1e2126d1f..3780030d81e 100644 --- a/python/src/mas/cli/install/app.py +++ b/python/src/mas/cli/install/app.py @@ -1134,7 +1134,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": @@ -1202,7 +1202,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 @@ -1263,13 +1262,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([ @@ -1298,7 +1290,7 @@ def install(self, argv): pipelinesNamespace = f"mas-{self.getParam('mas_instance_id')}-pipelines" with Halo(text='Validating OpenShift Pipelines installation', spinner=self.spinner) as h: - if installOpenShiftPipelines(self.dynamicClient): + if installOpenShiftPipelines(self.dynamicClient, customStorageClassName=self.getParam("storage_class_rwx")): h.stop_and_persist(symbol=self.successIcon, text="OpenShift Pipelines Operator is installed and ready to use") else: h.stop_and_persist(symbol=self.successIcon, text="OpenShift Pipelines Operator installation failed") @@ -1311,7 +1303,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( diff --git a/python/src/mas/cli/install/argBuilder.py b/python/src/mas/cli/install/argBuilder.py index 8bd261e6d17..03ff2596c13 100644 --- a/python/src/mas/cli/install/argBuilder.py +++ b/python/src/mas/cli/install/argBuilder.py @@ -458,8 +458,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: diff --git a/python/src/mas/cli/install/argParser.py b/python/src/mas/cli/install/argParser.py index a839f5618fb..15b9d282721 100644 --- a/python/src/mas/cli/install/argParser.py +++ b/python/src/mas/cli/install/argParser.py @@ -1139,12 +1139,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, diff --git a/python/src/mas/cli/install/summarizer.py b/python/src/mas/cli/install/summarizer.py index 515cf9eb6f1..38d14017bc2 100644 --- a/python/src/mas/cli/install/summarizer.py +++ b/python/src/mas/cli/install/summarizer.py @@ -353,8 +353,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")