From 1ddedd8612d99bdfe32be59ec5f8ac0b932fb6e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Mar 2017 13:57:37 +0000 Subject: [PATCH 01/23] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 023a0def736e90abd93234c7c33bcd23bef109f1 Mon Sep 17 00:00:00 2001 From: mkocka Date: Tue, 11 Apr 2017 10:58:10 +0200 Subject: [PATCH 02/23] adding ruby deps info --- README.md | 16 ++++++++++++++++ ruby.yaml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 README.md create mode 100644 ruby.yaml diff --git a/README.md b/README.md new file mode 100644 index 0000000..8cd32b9 --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +ruby dependencies +==================== + +build dependencies calculated by brt_dep_solver +----------------------------------------------- +autoconf +checksec +cmake +libyaml +multilib-rpm-config +systemtap + +runtime dependencies calculated by brt_dep_solver +------------------------------------------------- +ruby +rubypick diff --git a/ruby.yaml b/ruby.yaml new file mode 100644 index 0000000..4eabe52 --- /dev/null +++ b/ruby.yaml @@ -0,0 +1,30 @@ +data: + api: + rpms: + - ruby + components: + rpms: + autoconf: {rationale: Build dependency.} + checksec: {rationale: Build dependency.} + cmake: {rationale: Build dependency.} + libyaml: {rationale: Build dependency.} + multilib-rpm-config: {rationale: Build dependency.} + ruby: {rationale: Runtime dependency.} + rubypick: {rationale: Runtime dependency.} + systemtap: {rationale: Build dependency.} + description: 'Ruby is the interpreted scripting language for quick and easy + + object-oriented programming. It has many features to process text + + files and to do system management tasks (as in Perl). It is simple, + + straight-forward, and extensible.' + filter: {} + license: + module: [(Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD] + name: '' + stream: '' + summary: An interpreter of object-oriented scripting language + version: 0 +document: modulemd +version: 1 From a5499de9e0b17696990ddacbe96d794a493bb4b5 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Tue, 2 May 2017 14:35:14 +0200 Subject: [PATCH 03/23] First tests Signed-off-by: Petr "Stone" Hracek --- .gitignore | 1 + Dockerfile | 28 ++++++++++++++++++++++++++++ Makefile | 16 ++++++++++++++++ tests/Makefile | 8 ++++++++ tests/config.yaml | 30 ++++++++++++++++++++++++++++++ tests/generated.py | 25 +++++++++++++++++++++++++ 6 files changed, 108 insertions(+) create mode 100644 Dockerfile create mode 100644 Makefile create mode 100644 tests/Makefile create mode 100644 tests/config.yaml create mode 100644 tests/generated.py diff --git a/.gitignore b/.gitignore index e69de29..c2956c7 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +*.py[oc] diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..f88c3b6 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,28 @@ +FROM registry.fedoraproject.org/fedora:26 + +# ruby image for OpenShift. +# +# Environment: + +ENV NAME=ruby ARCH=x86_64 +LABEL MAINTAINER "Jun Aruga" +LABEL summary="An interpreter of object-oriented scripting language" \ + name="$FGC/$NAME" \ + version="0" \ + release="1.$DISTTAG" \ + architecture="$ARCH" \ + com.redhat.component=$NAME \ + usage="docker run f26/ruby" \ + help="Runs ruby. No dependencies. See Help File below for more details." \ + description="An interpreter of object-oriented scripting language" \ + io.k8s.description="An interpreter of object-oriented scripting language" \ + io.k8s.diplay-name="Ruby 2.4 " \ + io.openshift.tags="ruby" + +RUN dnf install -y --setopt=tsflags=nodocs ruby && \ + dnf -y clean all + +# ruby will be run under standard user on Fedora +USER 1000 + +CMD /bin/bash diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ef96813 --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ +IMAGE_NAME = ruby + +MODULEMDURL=file://ruby.yaml + +default: run + +build: + docker build --tag=$(IMAGE_NAME) . + +run: build + docker run -d $(IMAGE_NAME) + +test: build + cd tests; MODULE=docker MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all + cd tests; MODULE=rpm MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all + diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000..df28881 --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,8 @@ +MODULE_LINT=/usr/share/moduleframework/tools/modulelint.py +# --filter-by-tags=-WIP: ignore WIP tag test that have a issue on F25 avocado. +CMD=python -m avocado run --filter-by-tags=-WIP $(MODULE_LINT) *.py + +# +all: + generator + $(CMD) diff --git a/tests/config.yaml b/tests/config.yaml new file mode 100644 index 0000000..2632cd0 --- /dev/null +++ b/tests/config.yaml @@ -0,0 +1,30 @@ +document: modularity-testing +version: 1 +name: ruby +modulemd-url: https://src.fedoraproject.org/cgit/modules/ruby.git/plain/ruby.yaml +service: + port: 8080 +packages: + rpms: + # add which here because of the issue. + # https://pagure.io/modularity-testing-framework/issue/45 + - ruby +testdependecies: + rpms: + - which +module: + docker: + start: "docker run -it" + container: docker.io/ruby + rpm: + repos: + - http://download.eng.brq.redhat.com/pub/fedora/linux/development/rawhide/Everything/x86_64/os/ + - http://download.eng.brq.redhat.com/pub/fedora/linux/development/26/Everything/x86_64/os/ +test: + cmd: + - 'which ruby' + version: + - 'ruby -v' +testhost: + hostname: + - 'hostname' diff --git a/tests/generated.py b/tests/generated.py new file mode 100644 index 0000000..3d31f62 --- /dev/null +++ b/tests/generated.py @@ -0,0 +1,25 @@ +#!/usr/bin/python + +import socket +from avocado import main +from moduleframework import module_framework + +if __name__ == '__main__': + main() + +class GeneratedTestsConfig(module_framework.AvocadoTest): + """ + :avocado: enable + """ + + def test_cmd(self): + self.start() + self.run("which ruby") + + def test_version(self): + self.start() + self.run("ruby -v") + + def test_hostname(self): + self.start() + self.runHost("hostname") From f319e135b7438c4ccab3062a0479e525dcc458be Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Wed, 3 May 2017 09:12:42 +0200 Subject: [PATCH 04/23] Update tests Signed-off-by: Petr "Stone" Hracek --- .gitignore | 1 + tests/Makefile | 1 - tests/config.yaml | 13 ++----------- tests/{generated.py => ruby_tests.py} | 11 ++++++----- 4 files changed, 9 insertions(+), 17 deletions(-) rename tests/{generated.py => ruby_tests.py} (80%) diff --git a/.gitignore b/.gitignore index c2956c7..6a222e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.py[oc] +tests/generated.py diff --git a/tests/Makefile b/tests/Makefile index df28881..6060723 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -4,5 +4,4 @@ CMD=python -m avocado run --filter-by-tags=-WIP $(MODULE_LINT) *.py # all: - generator $(CMD) diff --git a/tests/config.yaml b/tests/config.yaml index 2632cd0..5bf624d 100644 --- a/tests/config.yaml +++ b/tests/config.yaml @@ -8,23 +8,14 @@ packages: rpms: # add which here because of the issue. # https://pagure.io/modularity-testing-framework/issue/45 + - which - ruby testdependecies: rpms: - which module: docker: - start: "docker run -it" container: docker.io/ruby rpm: repos: - - http://download.eng.brq.redhat.com/pub/fedora/linux/development/rawhide/Everything/x86_64/os/ - - http://download.eng.brq.redhat.com/pub/fedora/linux/development/26/Everything/x86_64/os/ -test: - cmd: - - 'which ruby' - version: - - 'ruby -v' -testhost: - hostname: - - 'hostname' + - http://mirror.vutbr.cz/fedora/releases/25/Everything/x86_64/os/ diff --git a/tests/generated.py b/tests/ruby_tests.py similarity index 80% rename from tests/generated.py rename to tests/ruby_tests.py index 3d31f62..ce9bbd5 100644 --- a/tests/generated.py +++ b/tests/ruby_tests.py @@ -4,10 +4,7 @@ import socket from avocado import main from moduleframework import module_framework -if __name__ == '__main__': - main() - -class GeneratedTestsConfig(module_framework.AvocadoTest): +class RubyTests(module_framework.AvocadoTest): """ :avocado: enable """ @@ -22,4 +19,8 @@ class GeneratedTestsConfig(module_framework.AvocadoTest): def test_hostname(self): self.start() - self.runHost("hostname") + self.run("hostname") + + +if __name__ == '__main__': + main() From addd9b74a4a4d249e8e8b0b922498c3c2ef2b2cb Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Wed, 3 May 2017 13:00:07 +0200 Subject: [PATCH 05/23] Add to dependency hostname Signed-off-by: Petr "Stone" Hracek --- tests/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/config.yaml b/tests/config.yaml index 5bf624d..14c3078 100644 --- a/tests/config.yaml +++ b/tests/config.yaml @@ -8,11 +8,11 @@ packages: rpms: # add which here because of the issue. # https://pagure.io/modularity-testing-framework/issue/45 - - which - ruby testdependecies: rpms: - which + - hostname module: docker: container: docker.io/ruby From aaffc099fedd5bbde5b717fb205a7e014e1bf781 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 8 Aug 2017 14:26:10 +0200 Subject: [PATCH 06/23] Fix to pass "mbs-build local". --- ruby.yaml | 112 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 84 insertions(+), 28 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 4eabe52..13c4159 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -1,30 +1,86 @@ -data: - api: - rpms: - - ruby - components: - rpms: - autoconf: {rationale: Build dependency.} - checksec: {rationale: Build dependency.} - cmake: {rationale: Build dependency.} - libyaml: {rationale: Build dependency.} - multilib-rpm-config: {rationale: Build dependency.} - ruby: {rationale: Runtime dependency.} - rubypick: {rationale: Runtime dependency.} - systemtap: {rationale: Build dependency.} - description: 'Ruby is the interpreted scripting language for quick and easy - - object-oriented programming. It has many features to process text - - files and to do system management tasks (as in Perl). It is simple, - - straight-forward, and extensible.' - filter: {} - license: - module: [(Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD] - name: '' - stream: '' - summary: An interpreter of object-oriented scripting language - version: 0 +# Keep a generated ruby.yaml file URL here to follow latest configuration. +# https://github.com/fedora-modularity/dependency-report/blob/master/modules/ruby/ruby.yaml document: modulemd version: 1 +data: + # From ruby.spec Summary + summary: An interpreter of object-oriented scripting language + # From ruby.spec description + description: >- + Ruby is the interpreted scripting language for quick and easy + object-oriented programming. It has many features to process text + files and to do system management tasks (as in Perl). It is simple, + straight-forward, and extensible.' + # From *.spec License + license: + module: + - Ruby or BSD + - Public Domain + - MIT + - CC0 + - zlib + - UCD + references: + community: http://ruby-lang.org/ + documentation: https://www.ruby-lang.org/en/documentation/ + tracker: https://bugs.ruby-lang.org/ + dependencies: + buildrequires: + bootstrap: master + requires: + platform: master + platform-placeholder: master + components: + # SRPMs + rpms: + ruby: + # From ruby.spec Summary + rationale: An interpreter of object-oriented scripting language + buildorder: 101 + ref: master + rubygem-bundler: + # From rubygem-bundler.spec Summary + rationale: >- + Library and utilities to manage a Ruby application's gem + dependencies + buildorder: 102 + ref: master + rubypick: + # From rubypick.spec Summary + rationale: Stub to allow choosing Ruby runtime + buildorder: 103 + ref: master + filiter: + # RPMs + rpms: + - rubypick + - ruby-doc + - rubygem-bundler-doc + api: + # RPMs + # From *.spec %package + rpms: + # From ruby.spec + - ruby + - ruby-devel + # - ruby-doc + - ruby-irb + - ruby-libs + - rubygems + - rubygems-devel + - rubygem-bigdecimal + - rubygem-did_you_mean + - rubygem-io-console + - rubygem-json + - rubygem-minitest + - rubygem-net-telnet + - rubygem-openssl + - rubygem-power_assert + - rubygem-psych + - rubygem-rake + - rubygem-rdoc + - rubygem-test-unit + - rubygem-xmlrpc + # From rubygem-bundler.spec + - rubygem-bundler + # - rubygem-bundler-doc From 0adc7c7978be7214a7bf0f15c128628e4abc8471 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Thu, 31 Aug 2017 15:37:39 +0200 Subject: [PATCH 07/23] Move /data/filter/rpms element. --- ruby.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 13c4159..eed88d5 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -50,12 +50,6 @@ data: rationale: Stub to allow choosing Ruby runtime buildorder: 103 ref: master - filiter: - # RPMs - rpms: - - rubypick - - ruby-doc - - rubygem-bundler-doc api: # RPMs # From *.spec %package @@ -84,3 +78,9 @@ data: # From rubygem-bundler.spec - rubygem-bundler # - rubygem-bundler-doc + filiter: + # RPMs + rpms: + - rubypick + - ruby-doc + - rubygem-bundler-doc From bc83a6b890db90dbb755bcd023b7ac6605b24b27 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 1 Sep 2017 10:51:29 +0200 Subject: [PATCH 08/23] remove stray trailing apostrophe --- ruby.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.yaml b/ruby.yaml index eed88d5..979b4b5 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -10,7 +10,7 @@ data: Ruby is the interpreted scripting language for quick and easy object-oriented programming. It has many features to process text files and to do system management tasks (as in Perl). It is simple, - straight-forward, and extensible.' + straight-forward, and extensible. # From *.spec License license: module: From 4decf52202dc7e78792040dec845e6702e8e9756 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 1 Sep 2017 10:51:46 +0200 Subject: [PATCH 09/23] fix licenses This addresses two topics: - The license/module key describes the license of the module (i.e. files in this repository) not that of the components contained in it. - The license/components key should be left empty and filled in by the module build tools. This way, the respective current licenses of the components used for building are put in, and we don't have to maintain their licenses in two places. --- ruby.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 979b4b5..9b2517d 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -11,15 +11,9 @@ data: object-oriented programming. It has many features to process text files and to do system management tasks (as in Perl). It is simple, straight-forward, and extensible. - # From *.spec License license: module: - - Ruby or BSD - - Public Domain - MIT - - CC0 - - zlib - - UCD references: community: http://ruby-lang.org/ documentation: https://www.ruby-lang.org/en/documentation/ From a7cbd8ce37995f759390b0c19586dc7c5af2d734 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 1 Sep 2017 12:31:34 +0200 Subject: [PATCH 10/23] Enable rubypick used by ruby-devel as a binary RPM. --- ruby.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 9b2517d..2f6b8e0 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -32,21 +32,23 @@ data: rationale: An interpreter of object-oriented scripting language buildorder: 101 ref: master + # From ruby.spec ruby-devel Requires + rubypick: + # From rubypick.spec Summary + rationale: Stub to allow choosing Ruby runtime + buildorder: 102 + ref: master rubygem-bundler: # From rubygem-bundler.spec Summary rationale: >- Library and utilities to manage a Ruby application's gem dependencies - buildorder: 102 - ref: master - rubypick: - # From rubypick.spec Summary - rationale: Stub to allow choosing Ruby runtime buildorder: 103 ref: master api: # RPMs # From *.spec %package + # *-doc are filtered. rpms: # From ruby.spec - ruby @@ -69,12 +71,13 @@ data: - rubygem-rdoc - rubygem-test-unit - rubygem-xmlrpc + # From rubypick.spec + - rubypick # From rubygem-bundler.spec - rubygem-bundler # - rubygem-bundler-doc filiter: # RPMs rpms: - - rubypick - ruby-doc - rubygem-bundler-doc From 92fcf2522e6e7a6bdaeccf494433a44ab2d679dd Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 4 Sep 2017 19:36:56 +0200 Subject: [PATCH 11/23] Update tests. Keep watching a workflow with modularity-testing-framework will be stable. --- Dockerfile | 34 +++++++++++----------------------- Makefile | 18 +++++------------- tests/Makefile | 19 +++++++++++++------ tests/config.yaml | 18 ++++-------------- tests/ruby_tests.py | 26 -------------------------- 5 files changed, 33 insertions(+), 82 deletions(-) delete mode 100644 tests/ruby_tests.py diff --git a/Dockerfile b/Dockerfile index f88c3b6..75809f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,28 +1,16 @@ -FROM registry.fedoraproject.org/fedora:26 +# A workflow with docker is still uncertain. +# Keep watching below file and other module's situation. +# https://github.com/container-images/container-image-template/blob/master/Dockerfile.template +FROM registry.fedoraproject.org/f26-modular/boltron -# ruby image for OpenShift. -# -# Environment: +WORKDIR /build +COPY . . -ENV NAME=ruby ARCH=x86_64 -LABEL MAINTAINER "Jun Aruga" -LABEL summary="An interpreter of object-oriented scripting language" \ - name="$FGC/$NAME" \ - version="0" \ - release="1.$DISTTAG" \ - architecture="$ARCH" \ - com.redhat.component=$NAME \ - usage="docker run f26/ruby" \ - help="Runs ruby. No dependencies. See Help File below for more details." \ - description="An interpreter of object-oriented scripting language" \ - io.k8s.description="An interpreter of object-oriented scripting language" \ - io.k8s.diplay-name="Ruby 2.4 " \ - io.openshift.tags="ruby" +ENV LC_CTYPE C.UTF-8 -RUN dnf install -y --setopt=tsflags=nodocs ruby && \ - dnf -y clean all - -# ruby will be run under standard user on Fedora -USER 1000 +RUN dnf -y update +RUN dnf -y --nodocs install \ + ruby \ + && dnf -y clean all CMD /bin/bash diff --git a/Makefile b/Makefile index ef96813..896a9c5 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,8 @@ -IMAGE_NAME = ruby - -MODULEMDURL=file://ruby.yaml - -default: run +default: test build: - docker build --tag=$(IMAGE_NAME) . - -run: build - docker run -d $(IMAGE_NAME) - -test: build - cd tests; MODULE=docker MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all - cd tests; MODULE=rpm MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all + docker build -t ruby . + docker run -d ruby +test: + $(MAKE) -C tests $@ diff --git a/tests/Makefile b/tests/Makefile index 6060723..6595113 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,7 +1,14 @@ -MODULE_LINT=/usr/share/moduleframework/tools/modulelint.py -# --filter-by-tags=-WIP: ignore WIP tag test that have a issue on F25 avocado. -CMD=python -m avocado run --filter-by-tags=-WIP $(MODULE_LINT) *.py - +# A workflow with modularity-testing-framework is still uncertain. +# Only nspawn is actually used. +# https://meta-test-family.readthedocs.io/en/latest/index.html # -all: - $(CMD) +# Installation +# $ sudo dnf install modularity-testing-framework python2-avocado +# $ sudo /usr/bin/pip install behave +test: + mtf-generator + MODULE=nspawn \ + python -d -m avocado run \ + --filter-by-tags=-WIP \ + /usr/share/moduleframework/tools/modulelint.py \ + *.py diff --git a/tests/config.yaml b/tests/config.yaml index 14c3078..ec3708c 100644 --- a/tests/config.yaml +++ b/tests/config.yaml @@ -2,20 +2,10 @@ document: modularity-testing version: 1 name: ruby modulemd-url: https://src.fedoraproject.org/cgit/modules/ruby.git/plain/ruby.yaml -service: - port: 8080 -packages: - rpms: - # add which here because of the issue. - # https://pagure.io/modularity-testing-framework/issue/45 - - ruby -testdependecies: - rpms: - - which - - hostname module: - docker: - container: docker.io/ruby rpm: repos: - - http://mirror.vutbr.cz/fedora/releases/25/Everything/x86_64/os/ + - http://mirror.vutbr.cz/fedora/releases/26/Everything/x86_64/os/ +test: + version: + - 'ruby -v' diff --git a/tests/ruby_tests.py b/tests/ruby_tests.py deleted file mode 100644 index ce9bbd5..0000000 --- a/tests/ruby_tests.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/python - -import socket -from avocado import main -from moduleframework import module_framework - -class RubyTests(module_framework.AvocadoTest): - """ - :avocado: enable - """ - - def test_cmd(self): - self.start() - self.run("which ruby") - - def test_version(self): - self.start() - self.run("ruby -v") - - def test_hostname(self): - self.start() - self.run("hostname") - - -if __name__ == '__main__': - main() From 48876570c335e7d5c936d9fd2c391c2e1db37aee Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 11 Sep 2017 10:46:11 +0200 Subject: [PATCH 12/23] Updated README.md * Removed outdated contents. * Added the Bugzilla URL to manage this Ruby module's status. https://bugzilla.redhat.com/show_bug.cgi?id=1490275 --- README.md | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 8cd32b9..a7b75ba 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,7 @@ -ruby dependencies -==================== +# modules/ruby -build dependencies calculated by brt_dep_solver ------------------------------------------------ -autoconf -checksec -cmake -libyaml -multilib-rpm-config -systemtap +## Current status -runtime dependencies calculated by brt_dep_solver -------------------------------------------------- -ruby -rubypick +This module is not available yet. +See this Bugzilla ticket to check the status. +https://bugzilla.redhat.com/show_bug.cgi?id=1490275 From 2efd3b9f48773e5436dde869b3256c1cf659c8c5 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 11 Sep 2017 11:00:36 +0200 Subject: [PATCH 13/23] Changed the BZ URL to see it from modules/ruby Bug reports page. https://bugzilla.redhat.com/show_bug.cgi?id=1490285 --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a7b75ba..ca416cb 100644 --- a/README.md +++ b/README.md @@ -3,5 +3,7 @@ ## Current status This module is not available yet. + See this Bugzilla ticket to check the status. -https://bugzilla.redhat.com/show_bug.cgi?id=1490275 + +https://bugzilla.redhat.com/show_bug.cgi?id=1490285 From 33ab62d06bd499a30e0a1a5a25770dcf4942e50c Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 18 Sep 2017 10:32:07 +0200 Subject: [PATCH 14/23] Drop rubypick from the Ruby module. Because rpms/ruby dropped rubypick from the ruby-devel dependency on rawhide. --- ruby.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 2f6b8e0..661da45 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -32,18 +32,12 @@ data: rationale: An interpreter of object-oriented scripting language buildorder: 101 ref: master - # From ruby.spec ruby-devel Requires - rubypick: - # From rubypick.spec Summary - rationale: Stub to allow choosing Ruby runtime - buildorder: 102 - ref: master rubygem-bundler: # From rubygem-bundler.spec Summary rationale: >- Library and utilities to manage a Ruby application's gem dependencies - buildorder: 103 + buildorder: 102 ref: master api: # RPMs @@ -71,8 +65,6 @@ data: - rubygem-rdoc - rubygem-test-unit - rubygem-xmlrpc - # From rubypick.spec - - rubypick # From rubygem-bundler.spec - rubygem-bundler # - rubygem-bundler-doc From 9b931f4585c91ecf4efb6dac2b6b5683785fde9f Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 3 Oct 2017 17:36:31 +0200 Subject: [PATCH 15/23] Remove platform-placeholder from dependencies/requires. It is just a temporary workaround for the dependency resolution scripts. --- ruby.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ruby.yaml b/ruby.yaml index 661da45..37bc728 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -23,7 +23,6 @@ data: bootstrap: master requires: platform: master - platform-placeholder: master components: # SRPMs rpms: From cd20f3fc9612c0098b0d032615edb7bccd84c2c3 Mon Sep 17 00:00:00 2001 From: Jan Scotka Date: Thu, 5 Oct 2017 11:26:44 +0200 Subject: [PATCH 16/23] repaired structure and config.yaml for nspawn and docker --- Makefile | 16 +++++++++++----- tests/Makefile | 14 +++----------- tests/config.yaml | 8 ++++++-- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 896a9c5..cd54e7a 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,14 @@ +DOCKER_IMAGE=ruby + default: test -build: - docker build -t ruby . - docker run -d ruby +build-docker: + docker build -t $(DOCKER_IMAGE) . + +test-nspawn: + MODULE=nspawn $(MAKE) -C tests test + +test-docker: build-docker + MODULE=docker URL=docker=$(DOCKER_IMAGE) $(MAKE) -C tests test -test: - $(MAKE) -C tests $@ +test: test-nspawn test-docker diff --git a/tests/Makefile b/tests/Makefile index 6595113..6683583 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,14 +1,6 @@ -# A workflow with modularity-testing-framework is still uncertain. -# Only nspawn is actually used. -# https://meta-test-family.readthedocs.io/en/latest/index.html -# # Installation -# $ sudo dnf install modularity-testing-framework python2-avocado -# $ sudo /usr/bin/pip install behave +# https://meta-test-family.readthedocs.io/en/latest/installation.html#installing-mtf test: + mtf-env-set mtf-generator - MODULE=nspawn \ - python -d -m avocado run \ - --filter-by-tags=-WIP \ - /usr/share/moduleframework/tools/modulelint.py \ - *.py + mtf -l *.py diff --git a/tests/config.yaml b/tests/config.yaml index ec3708c..491e3bf 100644 --- a/tests/config.yaml +++ b/tests/config.yaml @@ -2,10 +2,14 @@ document: modularity-testing version: 1 name: ruby modulemd-url: https://src.fedoraproject.org/cgit/modules/ruby.git/plain/ruby.yaml +packages: + rpms: + - ruby module: rpm: - repos: - - http://mirror.vutbr.cz/fedora/releases/26/Everything/x86_64/os/ + url: http://ftp.fi.muni.cz/pub/linux/fedora/linux/releases/26/Everything/x86_64/os/ + docker: + url: docker.io/centos/ruby-23-centos7 test: version: - 'ruby -v' From 0410a480a45e794d173d4aaaec98b81f17aaa13f Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 4 Oct 2017 15:55:39 +0200 Subject: [PATCH 17/23] Remove bootstrap from a build requires module. * Add platform module as a build requires module instead of that. * Add macros to remove some build dependencies. --- ruby.yaml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/ruby.yaml b/ruby.yaml index 37bc728..2aaa4ef 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -20,12 +20,25 @@ data: tracker: https://bugs.ruby-lang.org/ dependencies: buildrequires: - bootstrap: master + platform: master + autotools: master requires: platform: master components: # SRPMs rpms: + checksec: + rationale: Build dependency. + buildorder: 11 + ref: master + libyaml: + rationale: Build dependency. + buildorder: 11 + ref: master + multilib-rpm-config: + rationale: Build dependency. + buildorder: 11 + ref: master ruby: # From ruby.spec Summary rationale: An interpreter of object-oriented scripting language @@ -38,6 +51,13 @@ data: dependencies buildorder: 102 ref: master + buildopts: + rpms: + macros: | + %_without_rubypick 1 + %_without_systemtap 1 + %_without_git 1 + %_without_cmake 1 api: # RPMs # From *.spec %package From 2d087e8f132d13d6f4beb0e7bd1259136024015e Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Thu, 2 Nov 2017 16:34:29 +0100 Subject: [PATCH 18/23] As a temporary workflow, add default profile. Add it referring modules/perl perl.yaml. Omitted default profile causes an error because of the dnf issue. --- ruby.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ruby.yaml b/ruby.yaml index 2aaa4ef..8a44400 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -92,3 +92,7 @@ data: rpms: - ruby-doc - rubygem-bundler-doc + profiles: + default: + rpms: + - ruby From df6ff5381f117c4438f19ce09f5fd4164a0ac304 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Thu, 2 Nov 2017 17:02:31 +0100 Subject: [PATCH 19/23] Fix typo for filter element. Found by the report https://src.fedoraproject.org/modules/ruby/pull-request/3 . --- ruby.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.yaml b/ruby.yaml index 8a44400..d460d5b 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -87,7 +87,7 @@ data: # From rubygem-bundler.spec - rubygem-bundler # - rubygem-bundler-doc - filiter: + filter: # RPMs rpms: - ruby-doc From ea7e43110827d5a3adbec9be4b5d85c9d57c7b7c Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Thu, 2 Nov 2017 14:41:33 +0100 Subject: [PATCH 20/23] Remove build dependency RPMs that belong in platform module now. --- ruby.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index d460d5b..c237ee8 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -27,18 +27,6 @@ data: components: # SRPMs rpms: - checksec: - rationale: Build dependency. - buildorder: 11 - ref: master - libyaml: - rationale: Build dependency. - buildorder: 11 - ref: master - multilib-rpm-config: - rationale: Build dependency. - buildorder: 11 - ref: master ruby: # From ruby.spec Summary rationale: An interpreter of object-oriented scripting language From 3675ac43313317acbbc9fb603536dbc292dfa4f0 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 3 Nov 2017 16:38:31 +0100 Subject: [PATCH 21/23] Add explanation for the omitted profiles issue. --- ruby.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruby.yaml b/ruby.yaml index c237ee8..05ed9ca 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -80,6 +80,8 @@ data: rpms: - ruby-doc - rubygem-bundler-doc + # Add profiles/default as a temporary workflow + # because of a issue for omitted profiles element. profiles: default: rpms: From f938da2a53708bb41ed4e790668cc6f8a5986c94 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 3 Nov 2017 17:26:09 +0100 Subject: [PATCH 22/23] Bump the commit because of a mbs-build issue. --- ruby.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.yaml b/ruby.yaml index 05ed9ca..6635daa 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -80,7 +80,7 @@ data: rpms: - ruby-doc - rubygem-bundler-doc - # Add profiles/default as a temporary workflow + # Add profiles/default as a temporary workflow, # because of a issue for omitted profiles element. profiles: default: From 29fe4b7b2e9ef4c6e9bbbd7e98ec4b5889dde08e Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Thu, 15 Feb 2018 13:53:38 +0100 Subject: [PATCH 23/23] Update master branch with latest specification. --- ruby.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 6635daa..7b1620a 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -20,10 +20,9 @@ data: tracker: https://bugs.ruby-lang.org/ dependencies: buildrequires: - platform: master - autotools: master + platform: f28 requires: - platform: master + platform: f28 components: # SRPMs rpms: