diff --git a/.circleci/config.yml b/.circleci/config.yml index 0de5f5c..6644b6e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,12 +1,9 @@ version: 2.1 executors: - centos7: + rocky8: &rocky8-executor docker: - - image: tools-ext-01.ccr.xdmod.org/xdmod-10.0.0:centos7.9-0.6 - centos8: ¢os8-executor - docker: - - image: tools-ext-01.ccr.xdmod.org/centos8-0.1:base + - image: tools-ext-01.ccr.xdmod.org/xdmod-10.5.0-x86_64:rockylinux8.5-0.3 jobs: build: @@ -18,8 +15,8 @@ jobs: executor: << parameters.os >> environment: COMPOSER_ALLOW_SUPERUSER: 1 - XDMOD_REALMS: 'jobs,storage' - XDMOD_BRANCH: xdmod10.5 + XDMOD_REALMS: 'jobs,storage,cloud' + XDMOD_BRANCH: xdmod11.0 XDMOD_MODULE_NAME: appkernels XDMOD_IS_CORE: yes XDMOD_INSTALL_DIR: /xdmod @@ -27,7 +24,7 @@ jobs: steps: - run: name: Install Python3 - command: yum -y install --setopt=tsflags=nodocs python3 + command: dnf -y install --setopt=tsflags=nodocs python3 - run: name: Generate OpenSSL Key command: openssl genrsa -rand /proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/uptime 2048 > /etc/pki/tls/private/localhost.key @@ -41,7 +38,7 @@ jobs: - run: name: Setup Environment Variables command: | - echo "export XDMOD_APPKERNELS_DIR=$HOME/project" >> $BASH_ENV + echo "export XDMOD_APPKERNEL_DIR=$HOME/project" >> $BASH_ENV echo "export XDMOD_SOURCE_DIR=$HOME/xdmod" >> $BASH_ENV - run: name: Setup & Run Tests @@ -59,5 +56,5 @@ workflows: - build: matrix: parameters: - os: [centos7] - install-type: ["fresh_install"] + os: [rocky8] + install-type: ["fresh_install", "upgrade"] diff --git a/Dockerfile b/Dockerfile index b949c11..b9bf1b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM tools-ext-01.ccr.xdmod.org/xdmod-10.0.0:centos7.9-0.6 +FROM tools-ext-01.ccr.xdmod.org/xdmod-10.5.0-x86_64:rockylinux8.5-0.3 # install python3 for akrr build -RUN yum -y install --setopt=tsflags=nodocs python3 +RUN dnf -y install --setopt=tsflags=nodocs python3 diff --git a/Tests.Dockerfile b/Tests.Dockerfile index 53df7b8..30452bb 100644 --- a/Tests.Dockerfile +++ b/Tests.Dockerfile @@ -3,8 +3,8 @@ FROM tas-tools-ext-01.ccr.xdmod.org/centos7_6-open8.5.1:latest -RUN yum -y install --setopt=tsflags=nodocs python3 openssh-server && \ - yum clean all +RUN dnf -y install --setopt=tsflags=nodocs python3 openssh-server && \ + dnf clean all COPY . /root/src/ubccr/xdmod-appkernels WORKDIR /root/src/ubccr/xdmod-appkernels diff --git a/build.json b/build.json index c2adaf7..e4ea485 100644 --- a/build.json +++ b/build.json @@ -1,6 +1,6 @@ { "name": "xdmod-appkernels", - "version": "10.5.0", + "version": "11.0.0", "release": "1.0", "files": { "include_paths": [ diff --git a/classes/AppKernel/AppKernelDb.php b/classes/AppKernel/AppKernelDb.php index f599aba..457bdb9 100644 --- a/classes/AppKernel/AppKernelDb.php +++ b/classes/AppKernel/AppKernelDb.php @@ -2733,7 +2733,7 @@ public function calculateControls( $larger = true; $attr = explode(',', $metricAttribute); - if (isset($attr[2]) && count($attr[2]) > 0) { + if (isset($attr[2]) && strlen($attr[2]) > 0) { $larger = substr($attr[2], 0, 1) != 'S'; } if (isset($attr[1]) && $attr[1] !== '') { diff --git a/configuration/portal_settings.ini b/configuration/portal_settings.ini index 94fb1e2..425ba89 100644 --- a/configuration/portal_settings.ini +++ b/configuration/portal_settings.ini @@ -4,7 +4,7 @@ appkernels = "on" [appkernels-general] ; The version number is updated during the upgrade process. -version = "10.5.0" +version = "11.0.0" ; App kernel database and metric configuration. [appkernel] diff --git a/docs/_config.yml b/docs/_config.yml index 80f9afb..42f033c 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -35,8 +35,8 @@ defaults: type: "pages" values: layout: "page" - version: "10.5" - sw_version: "10.5.0" + version: "11.0" + sw_version: "11.0.0" style: "effervescence" tocversion: "toc" diff --git a/docs/ak-install-rpm.md b/docs/ak-install-rpm.md index ce76dc6..c0d6483 100644 --- a/docs/ak-install-rpm.md +++ b/docs/ak-install-rpm.md @@ -5,7 +5,7 @@ title: Application Kernels RPM Installation Guide Install RPM Package ------------------- - # yum install xdmod-appkernels-{{ page.sw_version }}-1.0.el7.noarch.rpm + # dnf install xdmod-appkernels-{{ page.sw_version }}-1.0.el8.noarch.rpm Run Configuration Script ------------------------ diff --git a/shippable.yml b/shippable.yml deleted file mode 100644 index 19bc715..0000000 --- a/shippable.yml +++ /dev/null @@ -1,47 +0,0 @@ -language: none -env: - global: - - COMPOSER_ALLOW_SUPERUSER=1 - - XDMOD_REALMS='jobs,storage' - - XDMOD_BRANCH=xdmod10.5 - - XDMOD_SOURCE_DIR=$SHIPPABLE_BUILD_DIR/../xdmod - - XDMOD_INSTALL_DIR=/xdmod - - XDMOD_MODULE_DIR=$SHIPPABLE_BUILD_DIR - - XDMOD_MODULE_NAME=appkernels - - XDMOD_TEST_MODE=fresh_install -build: - cache: true - cache_dir_list: - - /root/.composer - pre_ci: - - docker build -t pseudo_repo/xdmod-open-appkernels:latest . - pre_ci_boot: - image_name: pseudo_repo/xdmod-open-appkernels - image_tag: latest - pull: false - options: "--user root -e HOME=/root --shm-size 2g" - ci: - - ./tests/runtests.sh - on_failure: - - cat /var/log/xdmod/* -jobs: - - name: xdmod-appkernels_runCI - type: runCI - steps: - - IN: nightly-trigger - on_success: - - NOTIFY: email-team - on_failure: - - NOTIFY: email-team -resources: - - name: nightly-trigger - type: time - versionTemplate: - interval: "0 3 * * *" # UTC - - name: email-team - type: notification - versionTemplate: - method: email - recipients: - - "nikolays@buffalo.edu" - - "ccr-xdmod-cron@buffalo.edu" diff --git a/tests/README.md b/tests/README.md index 0cc5ab6..3186c55 100644 --- a/tests/README.md +++ b/tests/README.md @@ -10,7 +10,7 @@ Run Tests with specific XDMoD branch ```shell script docker run -it --rm -p 20080:8080 \ - -e XDMOD_BRANCH=xdmod10.5 \ + -e XDMOD_BRANCH=xdmod11.0 \ pseudo_repo/xdmod-appkernels-tests:latest ``` @@ -24,7 +24,7 @@ Same without rebuilding image by attaching host directory ```shell script # in xdmod-appkernels directory docker run -it --rm -p 20080:8080 \ - -e XDMOD_BRANCH=xdmod10.5 \ + -e XDMOD_BRANCH=xdmod11.0 \ -v `pwd`:/root/src/ubccr/xdmod-appkernels \ pseudo_repo/xdmod-appkernels-tests:latest ``` @@ -34,7 +34,7 @@ Using local XDMoD and adding remote debugging capabilities with port forwarding # in xdmod-appkernels directory docker run -it --rm \ -p 20443:443 -p 23306:3306 -p 20022:22 \ - -e XDMOD_BRANCH=xdmod10.5 \ + -e XDMOD_BRANCH=xdmod11.0 \ -v `pwd`/../xdmod:/root/src/ubccr/xdmod \ -v `pwd`/../xdmod-qa:/root/src/ubccr/xdmod-qa \ -v `pwd`:/root/src/ubccr/xdmod-appkernels \ diff --git a/tests/artifacts/create_akrr_db.sql b/tests/artifacts/create_akrr_db.sql index b1f8b52..29b016c 100644 --- a/tests/artifacts/create_akrr_db.sql +++ b/tests/artifacts/create_akrr_db.sql @@ -6,3 +6,4 @@ GRANT ALL ON mod_appkernel.* TO 'akrruser'@'localhost'; GRANT SELECT ON modw.* TO 'akrruser'@'localhost'; GRANT ALL ON mod_akrr.* TO 'xdmod'@'localhost'; GRANT ALL ON mod_appkernel.* TO 'xdmod'@'localhost'; +FLUSH PRIVILEGES; diff --git a/tests/runtests.sh b/tests/runtests.sh index b10f889..94e9bd5 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -57,7 +57,7 @@ if [ "$(realpath "$XDMOD_DIR/open_xdmod/modules/appkernels")" != "$(realpath "$X echo "$XDMOD_DIR/open_xdmod/modules/appkernels do not point to $XDMOD_APPKERNEL_DIR" fi -COMPOSER=composer-el7.json composer install -d ../xdmod --no-progress +composer install -d ../xdmod --no-progress # build xdmod rpms cd ../xdmod @@ -92,7 +92,7 @@ then mysql -u root mod_appkernel < $XDMOD_APPKERNEL_DIR/tests/artifacts/mod_appkernel_xdmod_dev_test.sql # install akrr - yum install -y $AKRR_DIR/dist/akrr-*.noarch.rpm + dnf install -y $AKRR_DIR/dist/akrr-*.noarch.rpm # copy akrr config cp -r $XDMOD_APPKERNEL_DIR/tests/artifacts/akrr ~/ @@ -114,7 +114,7 @@ then # Add an upstream branch so that the QA tests will run successfully git remote add upstream https://github.com/ubccr/xdmod-appkernels.git - git clone --depth=1 --branch=v1 https://github.com/ubccr/xdmod-qa.git .qa + git clone --depth=1 --branch=v2 https://github.com/ubccr/xdmod-qa.git .qa cd $XDMOD_APPKERNEL_DIR $SHIPPABLE_BUILD_DIR/.qa/scripts/install.sh ./ @@ -142,10 +142,18 @@ then # Configure xdmod appkernels expect $XDMOD_APPKERNEL_DIR/tests/ci/scripts/xdmod-appkernels-setup.tcl | col -b + # Ingest AK runs + xdmod-akrr-ingestor -q -l load -c -r + + # Test report + appkernel_reports_manager -m centerdirector -v -d -e 2019-02-28 + cd $SHIPPABLE_BUILD_DIR - git clone --depth=1 --branch=migrate_travis https://github.com/ryanrath/xdmod-qa.git .qa + git clone --depth=1 --branch=v2 https://github.com/ubccr/xdmod-qa.git .qa cd $XDMOD_APPKERNEL_DIR + git remote add upstream https://github.com/ubccr/xdmod-appkernels.git + $SHIPPABLE_BUILD_DIR/.qa/scripts/install.sh ./ $SHIPPABLE_BUILD_DIR/.qa/scripts/build.sh fi diff --git a/tests/utils/cmd_setup b/tests/utils/cmd_setup index 2a7d526..06de6bc 100755 --- a/tests/utils/cmd_setup +++ b/tests/utils/cmd_setup @@ -12,7 +12,7 @@ setup_xdebug(){ cd rpm -qa | grep php-pecl-xdebug > /dev/null 2>&1 if [ $? != 0 ]; then - yum install php-pecl-xdebug -y + dnf install php-pecl-xdebug -y fi grep 'xdebug.remote_host' /etc/php.d/xdebug.ini > /dev/null 2>&1 @@ -28,7 +28,7 @@ EOT # Install SSHD, allow root to access setup_sshd(){ - yum install -y openssh-server + dnf install -y openssh-server mkdir /var/run/sshd @@ -129,7 +129,7 @@ END runuser -l $AKRRUSER -c "echo \"export PATH=/root/akrr/bin:\$PATH\" >> $AKRRUSER_HOME/.bashrc" # Install dependencies - yum install -y python MySQL-python openssl curl + dnf install -y python MySQL-python openssl curl # akrr.sh start } diff --git a/xdmod-appkernels.spec.in b/xdmod-appkernels.spec.in index 9bd64de..575a612 100644 --- a/xdmod-appkernels.spec.in +++ b/xdmod-appkernels.spec.in @@ -11,7 +11,7 @@ Source: %{name}-%{version}__PRERELEASE__.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}__PRERELEASE__-%{release}-XXXXXX) BuildArch: noarch BuildRequires: php-cli -Requires: xdmod >= 10.5.0, xdmod < 10.6.0 +Requires: xdmod >= 11.0.0, xdmod < 11.1.0 %description This package provides application kernel support for Open XDMoD. The