From 023a0def736e90abd93234c7c33bcd23bef109f1 Mon Sep 17 00:00:00 2001 From: mkocka Date: Tue, 11 Apr 2017 10:58:10 +0200 Subject: [PATCH 01/63] 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 02/63] 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 03/63] 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 04/63] 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 05/63] 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 06/63] 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 07/63] 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 08/63] 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 09/63] 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 10/63] 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 11/63] 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 12/63] 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 13/63] 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 14/63] 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 15/63] 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: - $(MAKE) -C tests $@ +test-nspawn: + MODULE=nspawn $(MAKE) -C tests test + +test-docker: build-docker + MODULE=docker URL=docker=$(DOCKER_IMAGE) $(MAKE) -C tests test + +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 16/63] 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 17/63] 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 18/63] 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 19/63] 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 20/63] 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 21/63] 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 22/63] 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: From f8f25ee2097f867dec98c836e27a11cff0adca9d Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 27 Mar 2018 11:10:41 +0200 Subject: [PATCH 23/63] Empty commit to update the built RPM packages to latest verson. From 2c2bc9b4f03d360add92af48c0335ee8aeff4bb3 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 17 Apr 2018 16:58:46 +0200 Subject: [PATCH 24/63] Add DB connectors and rubygem-abrt. --- ruby.yaml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/ruby.yaml b/ruby.yaml index 7b1620a..3f83716 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -31,6 +31,12 @@ data: rationale: An interpreter of object-oriented scripting language buildorder: 101 ref: master + rubygem-abrt: + # From rubygem-abrt.spec Summary + rationale: >- + ABRT support for Ruby + buildorder: 102 + ref: master rubygem-bundler: # From rubygem-bundler.spec Summary rationale: >- @@ -38,6 +44,30 @@ data: dependencies buildorder: 102 ref: master + rubygem-mysql2: + # From rubygem-mysql2.spec Summary + rationale: >- + A simple, fast Mysql library for Ruby, binding to libmysql + buildorder: 102 + ref: master + rubygem-pg: + # From rubygem-pg.spec Summary + rationale: >- + A Ruby interface to the PostgreSQL RDBMS + buildorder: 102 + ref: master + rubygem-bson: + # From rubygem-bson.spec Summary + rationale: >- + Ruby Implementation of the BSON specification + buildorder: 102 + ref: master + rubygem-mongo: + # From rubygem-mongo.spec Summary + rationale: >- + Ruby driver for MongoDB + buildorder: 103 + ref: master buildopts: rpms: macros: | @@ -71,14 +101,34 @@ data: - rubygem-rdoc - rubygem-test-unit - rubygem-xmlrpc + # From rubygem-abrt.spec + - rubygem-abrt + # - rubygem-abrt-doc # From rubygem-bundler.spec - rubygem-bundler # - rubygem-bundler-doc + # From rubygem-mysql2.spec + - rubygem-mysql2 + # - rubygem-mysql2-doc + # From rubygem-pg.spec + - rubygem-pg + # - rubygem-pg-doc + # From rubygem-bson.spec + - rubygem-bson + # - rubygem-bson-doc + # From rubygem-mongo.spec + - rubygem-mongo + # - rubygem-mongo-doc filter: # RPMs rpms: - ruby-doc + - rubygem-abrt-doc - rubygem-bundler-doc + - rubygem-mysql2-doc + - rubygem-pg-doc + - rubygem-bson-doc + - rubygem-mongo-doc # Add profiles/default as a temporary workflow, # because of a issue for omitted profiles element. profiles: From 2f6b129c8e860964b4b3aef840423a212f00e7c1 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Thu, 30 Aug 2018 17:02:14 +0200 Subject: [PATCH 25/63] Remove doc packages from /data/filter/rpms to ship those. --- ruby.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 3f83716..a047af4 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -119,16 +119,6 @@ data: # From rubygem-mongo.spec - rubygem-mongo # - rubygem-mongo-doc - filter: - # RPMs - rpms: - - ruby-doc - - rubygem-abrt-doc - - rubygem-bundler-doc - - rubygem-mysql2-doc - - rubygem-pg-doc - - rubygem-bson-doc - - rubygem-mongo-doc # Add profiles/default as a temporary workflow, # because of a issue for omitted profiles element. profiles: From 5d39416d84c106f3962c640e00c6c924bc0aa1a6 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 31 Aug 2018 12:12:42 +0200 Subject: [PATCH 26/63] Remove doc packages comments. doc packages not listed in /data/api/rpms are shipped as "unsupported" or "implementation details". See https://pagure.io/modulemd/blob/master/f/spec.yaml --- ruby.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index a047af4..3ebbdd7 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -78,12 +78,10 @@ data: api: # RPMs # From *.spec %package - # *-doc are filtered. rpms: # From ruby.spec - ruby - ruby-devel - # - ruby-doc - ruby-irb - ruby-libs - rubygems @@ -103,22 +101,16 @@ data: - rubygem-xmlrpc # From rubygem-abrt.spec - rubygem-abrt - # - rubygem-abrt-doc # From rubygem-bundler.spec - rubygem-bundler - # - rubygem-bundler-doc # From rubygem-mysql2.spec - rubygem-mysql2 - # - rubygem-mysql2-doc # From rubygem-pg.spec - rubygem-pg - # - rubygem-pg-doc # From rubygem-bson.spec - rubygem-bson - # - rubygem-bson-doc # From rubygem-mongo.spec - rubygem-mongo - # - rubygem-mongo-doc # Add profiles/default as a temporary workflow, # because of a issue for omitted profiles element. profiles: From 28ccf1a2f92fa40a749bfaeb57699ac0bbd9ce26 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 3 Sep 2018 15:15:57 +0200 Subject: [PATCH 27/63] Empty commit to update the built RPM packages to latest verson. From e659d77af98afd12bf8068966704b129e3af82c4 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 3 Sep 2018 18:03:12 +0200 Subject: [PATCH 28/63] Update to modulemd v2. --- ruby.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 3ebbdd7..1d07279 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -1,7 +1,7 @@ # 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 +version: 2 data: # From ruby.spec Summary summary: An interpreter of object-oriented scripting language @@ -19,10 +19,10 @@ data: documentation: https://www.ruby-lang.org/en/documentation/ tracker: https://bugs.ruby-lang.org/ dependencies: - buildrequires: - platform: f28 - requires: - platform: f28 + - buildrequires: + platform: [f29] + requires: + platform: [f29] components: # SRPMs rpms: From c1fe9b887872509e1c684dd339dc37fc2391f194 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 14 Sep 2018 14:24:30 +0200 Subject: [PATCH 29/63] Empty commit to update the built RPM packages to latest verson. From 326c4847b6795f0fadb356edf14125f4ba30dc2b Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 14 Sep 2018 16:12:10 +0200 Subject: [PATCH 30/63] Skip tests because of test failure of rubygem-mongo. --- ruby.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ruby.yaml b/ruby.yaml index 1d07279..041ee2f 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -75,6 +75,7 @@ data: %_without_systemtap 1 %_without_git 1 %_without_cmake 1 + %_without_tests 1 api: # RPMs # From *.spec %package From 85e4fbf784587c0924bc19634a83d7fbab0560b8 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 14 Sep 2018 17:52:21 +0200 Subject: [PATCH 31/63] Remove the comment for dependency-report repository. Because it is outdated. See https://github.com/fedora-modularity/dependency-report/issues/12 --- ruby.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 041ee2f..b61bc4e 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -1,5 +1,3 @@ -# 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: 2 data: From f21efbfb93151c222277b6f7ba8f515f591a0a80 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 14 Sep 2018 17:58:23 +0200 Subject: [PATCH 32/63] "platform: []" is recommended. To build for all supported Fedora releases flexibly. See https://docs.fedoraproject.org/en-US/modularity/making-modules/defining-modules/#_modular_dependencies --- ruby.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index b61bc4e..829cde5 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -18,9 +18,9 @@ data: tracker: https://bugs.ruby-lang.org/ dependencies: - buildrequires: - platform: [f29] + platform: [] requires: - platform: [f29] + platform: [] components: # SRPMs rpms: From bcce58d3938d9d236e51857d806767d7325989d1 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 17 Sep 2018 17:40:25 +0200 Subject: [PATCH 33/63] Remove platform f28 to avoid the build failure as a temporary workflow. --- ruby.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 829cde5..52d2292 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -18,9 +18,11 @@ data: tracker: https://bugs.ruby-lang.org/ dependencies: - buildrequires: - platform: [] + # platform: [] is recommended. + # But set "-f28" to avoid the build failure as a temporary workflow. + platform: [-f28] requires: - platform: [] + platform: [-f28] components: # SRPMs rpms: From e4b088785f8ff0d2ebc122bf519c5083a6bf7f4c Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 18 Sep 2018 10:37:04 +0200 Subject: [PATCH 34/63] The reason that we removed f28 from platform is for TLS 1.3 issues. > Remove platform f28 to avoid the build failure as a temporary workflow. Because on f28 the patch to fix TLS 1.3 issues are not applied. The test TestNetHTTPS#test_session_reuse is failed. From b66ae8c5de9e6c74c504ae623191ba3e4241973a Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 18 Sep 2018 10:56:12 +0200 Subject: [PATCH 35/63] Remove macros to remove systemtap, git and cmake. Because it is better to run the tests for that in rpms/ruby. Last time we could not refer the packages that is not included in platform module. But now we can. --- ruby.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 52d2292..408acd5 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -72,9 +72,6 @@ data: rpms: macros: | %_without_rubypick 1 - %_without_systemtap 1 - %_without_git 1 - %_without_cmake 1 %_without_tests 1 api: # RPMs From 16723c825163b93f75e47242d98123afa596a11d Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 3 Oct 2018 18:19:32 +0200 Subject: [PATCH 36/63] Add multilib for both i686 and x86_64 versions to be installed on x86_64. --- ruby.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ruby.yaml b/ruby.yaml index 408acd5..907b034 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -29,6 +29,7 @@ data: ruby: # From ruby.spec Summary rationale: An interpreter of object-oriented scripting language + multilib: [ x86_64 ] buildorder: 101 ref: master rubygem-abrt: From e3210c173d1a7383a88b07ba8b0dd5cd402de561 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 3 Oct 2018 18:37:15 +0200 Subject: [PATCH 37/63] Refactoring multilib. --- ruby.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.yaml b/ruby.yaml index 907b034..d48bdd9 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -29,7 +29,7 @@ data: ruby: # From ruby.spec Summary rationale: An interpreter of object-oriented scripting language - multilib: [ x86_64 ] + multilib: [x86_64] buildorder: 101 ref: master rubygem-abrt: From 9f165149717363aa3b3a8fafb990286f6406140a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 18 Feb 2019 23:01:09 +0000 Subject: [PATCH 38/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering From dd90e5da318500317d8a022c60244b76c4ad0688 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Mar 2019 19:23:03 +0000 Subject: [PATCH 39/63] Branching f30 from rawhide Signed-off-by: Fedora Release Engineering From 2333349e7a25a8c6e718fdff46d8561371199da1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 4 Mar 2019 18:13:48 +0000 Subject: [PATCH 40/63] Branching f30 from rawhide, second attempt after platform:f31 enablement Signed-off-by: Fedora Release Engineering From 2f9338d93daa01c09d1771f5c81e80ecfcfb99c7 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 11 Mar 2019 17:15:31 +0100 Subject: [PATCH 41/63] Empty commit to update the built RPM packages to latest verson. To apply a latest commit to fix rpms/ruby FTBFS. From dd0a7853746cafe9046d5b294ff3ea90555f0d3f Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 13 Mar 2019 16:02:34 +0100 Subject: [PATCH 42/63] Remove "%_without_rubypick 1" to build with same condition of rpms/ruby. --- ruby.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.yaml b/ruby.yaml index d48bdd9..dc06763 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -72,7 +72,7 @@ data: buildopts: rpms: macros: | - %_without_rubypick 1 + # To disable tests in several packages. %_without_tests 1 api: # RPMs From 0a871b6a0bfcb48224edd87b98345272418ed4bf Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 3 Apr 2019 16:07:19 +0200 Subject: [PATCH 43/63] Empty commit to update the built RPM packages to latest verson. From 3eb86e85d17424f6a92eb28a740dd2852cd86498 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Thu, 2 May 2019 16:03:33 +0200 Subject: [PATCH 44/63] Remove outdated README.md. modules/ruby is available now! --- README.md | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index ca416cb..0000000 --- a/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# modules/ruby - -## Current status - -This module is not available yet. - -See this Bugzilla ticket to check the status. - -https://bugzilla.redhat.com/show_bug.cgi?id=1490285 From 1e6f5f80fce62b5f7c2b533a8085f2a16973acbb Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 29 May 2019 14:49:03 +0200 Subject: [PATCH 45/63] Remove rubygem-bundler. rubygem-bundler is now included in rpms/ruby. --- ruby.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index dc06763..e838c2d 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -38,13 +38,6 @@ data: ABRT support for Ruby 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 rubygem-mysql2: # From rubygem-mysql2.spec Summary rationale: >- @@ -86,6 +79,7 @@ data: - rubygems - rubygems-devel - rubygem-bigdecimal + - rubygem-bundler - rubygem-did_you_mean - rubygem-io-console - rubygem-json @@ -100,8 +94,6 @@ data: - rubygem-xmlrpc # From rubygem-abrt.spec - rubygem-abrt - # From rubygem-bundler.spec - - rubygem-bundler # From rubygem-mysql2.spec - rubygem-mysql2 # From rubygem-pg.spec From 09fa9ca804db58d0fdc457ac00a18b2f76d28ef1 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 29 May 2019 14:55:49 +0200 Subject: [PATCH 46/63] Change ruby-irb to rubygem-irb. Because rpms/ruby changed the package name. --- ruby.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.yaml b/ruby.yaml index e838c2d..dff0f89 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -74,7 +74,6 @@ data: # From ruby.spec - ruby - ruby-devel - - ruby-irb - ruby-libs - rubygems - rubygems-devel @@ -82,6 +81,7 @@ data: - rubygem-bundler - rubygem-did_you_mean - rubygem-io-console + - rubygem-irb - rubygem-json - rubygem-minitest - rubygem-net-telnet From 0f8fedf4e98a87c9f1322098e0cdc26beaaa093e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 12 Aug 2019 15:07:09 +0000 Subject: [PATCH 47/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 28d4f50f244e1abf9e3aab94044d944d9df87ea8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 13 Aug 2019 20:04:52 +0000 Subject: [PATCH 48/63] Branching f31 from rawhide Signed-off-by: Fedora Release Engineering From 6b37365700a2ad968f02aa70aaee35a816cb90d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 26 Aug 2019 14:03:56 +0000 Subject: [PATCH 49/63] Branching f31 from rawhide, second attempt after platform:f32 enablement Signed-off-by: Fedora Release Engineering From aec408b5ec8617a4de91771f5a33e015047b09ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 22 Sep 2019 07:59:10 +0000 Subject: [PATCH 50/63] Branching f31 from rawhide, fourth attempt after platform:f32 enablement due to https://pagure.io/releng/issue/8664 Signed-off-by: Fedora Release Engineering From a61d136f698ca0f0a70f4b500b1e3ae192fb744b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 6 Feb 2020 18:30:07 +0000 Subject: [PATCH 51/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering From afeda4b52594c78efd042479ad1be9d35fafdd45 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 14 Feb 2020 17:11:07 +0000 Subject: [PATCH 52/63] Branching f32 from rawhide Signed-off-by: Fedora Release Engineering From ddec35ca58eecb31bc4b24675e2f9e3b94b7cca4 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 22 May 2020 17:27:55 +0200 Subject: [PATCH 53/63] Add ruby-default-gems RPM. --- ruby.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruby.yaml b/ruby.yaml index dff0f89..58445d3 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -75,10 +75,12 @@ data: - ruby - ruby-devel - ruby-libs + - ruby-default-gems - rubygems - rubygems-devel - rubygem-bigdecimal - rubygem-bundler + # It's used in Ruby 2.6 on f31. - rubygem-did_you_mean - rubygem-io-console - rubygem-irb From fbccca2e7960d194a4d77cb0284f7657382182ef Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 22 May 2020 17:56:52 +0200 Subject: [PATCH 54/63] Remove "-f28", as it's not the build target any more. --- ruby.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 58445d3..3935c2c 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -19,10 +19,9 @@ data: dependencies: - buildrequires: # platform: [] is recommended. - # But set "-f28" to avoid the build failure as a temporary workflow. - platform: [-f28] + platform: [] requires: - platform: [-f28] + platform: [] components: # SRPMs rpms: From 368675fe5ef53c2143f623394ff3c44aef6dd6c2 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 25 May 2020 19:22:36 +0200 Subject: [PATCH 55/63] Fix build failures. * Skip el8 target to avoid the following error. "error: one or more PCH files were found, but they were invalid". * Set %_without_hardening_test macro to avoid checksec error on f30. --- ruby.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 3935c2c..c4e27fb 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -19,9 +19,9 @@ data: dependencies: - buildrequires: # platform: [] is recommended. - platform: [] + platform: [-el8] requires: - platform: [] + platform: [-el8] components: # SRPMs rpms: @@ -66,6 +66,8 @@ data: macros: | # To disable tests in several packages. %_without_tests 1 + # To avoid the error by rpms/ruby `checksec --file` on f30. + %_without_hardening_test 1 api: # RPMs # From *.spec %package From ee9e673941ccf7ad71c35f2d14cb58f5a680f9c2 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 11 Aug 2020 13:41:48 +0200 Subject: [PATCH 56/63] Update macros. * Remove %_without_hardening_test as f30 was removed from the buildroot. * Add %test_timeout_scale to improve unstable tests by timeout in ruby. --- ruby.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index c4e27fb..09ab1ef 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -66,8 +66,8 @@ data: macros: | # To disable tests in several packages. %_without_tests 1 - # To avoid the error by rpms/ruby `checksec --file` on f30. - %_without_hardening_test 1 + # To avoid the test faiures by timeout in ruby. + %test_timeout_scale 6 api: # RPMs # From *.spec %package From 3d77066f0cfcc0959287567405ba7973bfa6a0e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Aug 2020 04:49:38 +0000 Subject: [PATCH 57/63] Branching f33 from rawhide Signed-off-by: Fedora Release Engineering From d34161186d52b2fcfbd93d0fe674bc797fc5a0fc Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Wed, 19 May 2021 18:14:00 +0200 Subject: [PATCH 58/63] Initial import. --- ruby.yaml | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 ruby.yaml diff --git a/ruby.yaml b/ruby.yaml new file mode 100644 index 0000000..09ab1ef --- /dev/null +++ b/ruby.yaml @@ -0,0 +1,113 @@ +document: modulemd +version: 2 +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. + license: + module: + - MIT + references: + community: http://ruby-lang.org/ + documentation: https://www.ruby-lang.org/en/documentation/ + tracker: https://bugs.ruby-lang.org/ + dependencies: + - buildrequires: + # platform: [] is recommended. + platform: [-el8] + requires: + platform: [-el8] + components: + # SRPMs + rpms: + ruby: + # From ruby.spec Summary + rationale: An interpreter of object-oriented scripting language + multilib: [x86_64] + buildorder: 101 + ref: master + rubygem-abrt: + # From rubygem-abrt.spec Summary + rationale: >- + ABRT support for Ruby + buildorder: 102 + ref: master + rubygem-mysql2: + # From rubygem-mysql2.spec Summary + rationale: >- + A simple, fast Mysql library for Ruby, binding to libmysql + buildorder: 102 + ref: master + rubygem-pg: + # From rubygem-pg.spec Summary + rationale: >- + A Ruby interface to the PostgreSQL RDBMS + buildorder: 102 + ref: master + rubygem-bson: + # From rubygem-bson.spec Summary + rationale: >- + Ruby Implementation of the BSON specification + buildorder: 102 + ref: master + rubygem-mongo: + # From rubygem-mongo.spec Summary + rationale: >- + Ruby driver for MongoDB + buildorder: 103 + ref: master + buildopts: + rpms: + macros: | + # To disable tests in several packages. + %_without_tests 1 + # To avoid the test faiures by timeout in ruby. + %test_timeout_scale 6 + api: + # RPMs + # From *.spec %package + rpms: + # From ruby.spec + - ruby + - ruby-devel + - ruby-libs + - ruby-default-gems + - rubygems + - rubygems-devel + - rubygem-bigdecimal + - rubygem-bundler + # It's used in Ruby 2.6 on f31. + - rubygem-did_you_mean + - rubygem-io-console + - rubygem-irb + - 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-abrt.spec + - rubygem-abrt + # From rubygem-mysql2.spec + - rubygem-mysql2 + # From rubygem-pg.spec + - rubygem-pg + # From rubygem-bson.spec + - rubygem-bson + # From rubygem-mongo.spec + - rubygem-mongo + # Add profiles/default as a temporary workflow, + # because of a issue for omitted profiles element. + profiles: + default: + rpms: + - ruby From bffc88c84584e56096d652bbc27dae5ae40973b1 Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Fri, 14 May 2021 12:03:55 +0200 Subject: [PATCH 59/63] Upgrade refs for Ruby 3.0. --- ruby.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 09ab1ef..a071658 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -30,37 +30,37 @@ data: rationale: An interpreter of object-oriented scripting language multilib: [x86_64] buildorder: 101 - ref: master + ref: rawhide rubygem-abrt: # From rubygem-abrt.spec Summary rationale: >- ABRT support for Ruby buildorder: 102 - ref: master + ref: rawhide rubygem-mysql2: # From rubygem-mysql2.spec Summary rationale: >- A simple, fast Mysql library for Ruby, binding to libmysql buildorder: 102 - ref: master + ref: rawhide rubygem-pg: # From rubygem-pg.spec Summary rationale: >- A Ruby interface to the PostgreSQL RDBMS buildorder: 102 - ref: master + ref: rawhide rubygem-bson: # From rubygem-bson.spec Summary rationale: >- Ruby Implementation of the BSON specification buildorder: 102 - ref: master + ref: rawhide rubygem-mongo: # From rubygem-mongo.spec Summary rationale: >- Ruby driver for MongoDB buildorder: 103 - ref: master + ref: rawhide buildopts: rpms: macros: | From a1b4ff74a5710f9d727b09e4947d06d775b35e8d Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Wed, 19 May 2021 18:49:55 +0200 Subject: [PATCH 60/63] Remove rubygem-mongo and rubygem-bson. Remove rubygem-mongo as the mongodb-server is no longer shipped in Fedora. Drop rubygem-bson as that was a dependency of rubygem-mongo. Relevant commit: https://src.fedoraproject.org/rpms/rubygem-mongo/c/084949d10c26e9e5301f4da17c9817aa927647d6?branch=rawhide --- ruby.yaml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index a071658..57e1583 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -49,18 +49,6 @@ data: A Ruby interface to the PostgreSQL RDBMS buildorder: 102 ref: rawhide - rubygem-bson: - # From rubygem-bson.spec Summary - rationale: >- - Ruby Implementation of the BSON specification - buildorder: 102 - ref: rawhide - rubygem-mongo: - # From rubygem-mongo.spec Summary - rationale: >- - Ruby driver for MongoDB - buildorder: 103 - ref: rawhide buildopts: rpms: macros: | @@ -101,10 +89,6 @@ data: - rubygem-mysql2 # From rubygem-pg.spec - rubygem-pg - # From rubygem-bson.spec - - rubygem-bson - # From rubygem-mongo.spec - - rubygem-mongo # Add profiles/default as a temporary workflow, # because of a issue for omitted profiles element. profiles: From cd9ea832a373260414383e100540c12e7fe598f8 Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Fri, 16 Jul 2021 01:12:38 +0200 Subject: [PATCH 61/63] Empty commit to update the built RPM packages to latest verson. From 176006516d4768b69af6d33d24d641e8ef045d0b Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Thu, 2 Sep 2021 16:21:38 +0200 Subject: [PATCH 62/63] Empty commit to update the built RPM packages to latest verson. From 7d39a9988be6f89892bf43bf2f441fda509f53cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 10 Aug 2022 16:53:58 +0000 Subject: [PATCH 63/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering